Merge branch 'creditor_save_fix' into v44