Merge "DALi Version 2.2.15" into devel/master