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