Cleanup/parameters for 3.8 See merge request !3677
mentioned in commit f10af39b
mentioned in commit d8717d63
mentioned in commit d7f7a1e8