Merge "DALi Version 1.2.30" into devel/master