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