NYCCHKBK-3941 and NYCCHKBK-3959