HCOLL-155 cleaned up putOnClose
Merge remote-tracking branch 'origin/master'