merge safe_save_after_20h into frozen_code_grand_challenge

I am not sure this is a very clean way to do that...