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