2.3 only - Collection of minor fixes
Merge pull request #3177 from bicpi/fixing_collection_2_3_only

2.3 only - Collection of minor fixes