Merge "Remove includes and parameter functions" into feature/zuulv3