Merge branch '2545_save_history_fix'