Updates for enhancement 1082.