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