Missing patch for Stage Encoding

This brings in 3 commits from @jlee-r7 that went AWOL during the #3770 PR.