O'Neil: Bug fixes relating to issue #22317
O'Neil: Bug fixes relating to issues #10695, 10697 and #11434
O'Neil: Bug fixes relating to issue #21568
New tests for calendar argument
O'Neil: Bug fixes relating to issue #22282