Merge "DALi Version 1.3.30" into devel/master