Added ability to selectively forward def arg vals
CORE-5340