Merge branch 'lego12239-master'