parent issues: 6692,6691. Affects issues #5669, #5668, #5727, of which m...

Fix for Issues #6692, #6691 - which in turn needs to move code or override code in the following issues which have been fixed:
 #5669, #5668, #5727