Merge "DALi Version 2.3.22" into devel/master