Merge "DALi Version 1.2.15" into devel/master