[dali_1.2.50] Merge branch 'devel/master'