CGIV-3821: Make it more obvious that we are adding options to the defaults