case 4335 - Object page subjects elimination.
Merge branch 'case-4335' into develop