Merge "DALi Version 2.1.22" into devel/master