CGIV-1013: Switching to force_default so that it can still be overriden with a override parapeter