saas-2053 implementation
fix after release of s4_2013
Merge branch 'release/s4_2013'