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