Merge branch 'i23903'
Merge branch 'master' into i22970
#22970 Fixed js bug with tabs
Merge branch 'i22970' into dev