Refactor Feedforward Angle and RC Smoothing - mashup of 12578 and 12594 (#12605)