Integrated new feedback
Removed any call to clean up GC
Merge branch 'develop' into release/1.6_RC_2