- 7_1_X backport of csc_post-ls1_integration for 7_2_X
Merge pull request #4275 from barvic/7_1_X_backport_csc_post-ls1_integration

Backport to 7_1_X from 7_2_X of curent CSC changes for CSC Post-LS1 Integration