Merge "Fix delay_save and multiple required fields." into qt-dev