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