Merge "DALi Version 1.2.49" into devel/master