apply saveing fallback value bug patches for 3-0-stable