Updates for latest merge request

Recent MR into development occurred, please initiate the approval process to get these updates.

This image depends on cp-enterprise-control-center image.