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