Restore necessary logic for update_stable - refs #000
Merge commit '101b743b6e63ea274dc6e21251c1214c94c4658c'