Merge "[API feedback] add an option to exclude parameters" into main