Merge branch 'BS-8994_DocManag_Multiple' into 'master'
Merge branch 'master' into 'BS-10352_FileWidgetImpr'