Merge "DALi Version 1.3.22" into devel/master