[MERGE] merge with payroll branch