Synch to platform 069bb24
cms issue 30132
cms issue 30282