Merge "DALi Version 2.2.4" into devel/master