Merge "DALi Version 1.2.22" into devel/master