[MERGE] staging branch with misc fixes in accounting