Merged 17x

This PR simply merges 17x into master.