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