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