putting fixes for S8
SAAS-2005
Merge branch 'release/S8' into develop