[dali_1.3.21] Merge branch 'devel/master'