Merge "DALi Version 1.2.21" into devel/master