Merged rerun-behavior-fixes