Stability improvement

This release includes one infrastructure correction for multi-tenant environments.