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