Dev s5 1064020 js

Jonas Seidl requested to merge dev_S5_1064020_JS into dev_s5