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