[BC_BREAK] Fixes #6063

Fixes #6063 , pointed to develop branch.  based on discussion on #6064