changes corresponding to B-90540

Please review the changes.