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