Merge "Remove unused parameters" into devel/master