merged from master to master_abort_recovery_fix2