Changing heading while RTL or AUTO

WP_YAW_BEHAVIOR controls copter heading while on the way to the next WP. But it changes once you touch Yaw. Heading towards WP never returns after you turn, even a little.
Is it possible to maintain copter front heading towards waypoint even after temporarily changing the yaw during its flight to the next waypoint?