updating configuration keys
Merge branch '1.17-candidate' into 1.18-candidate