Merging changes for NYCCHKBK-3697 from checkbook_edc to checkbook_edc_maint_fork