[dali_2.1.27] Merge branch 'devel/master'