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