Case 3657 - Added proper collection subobject check.
Merge branch 'case-3657' into develop

* case-3657:
  Case 3657 - Added proper collection subobject check.