Merge remote-tracking branch 'remotes/origin/KON-684' into DEVELOP