2.1.1 (2020-09-25) Bug Fixes context: move context checks to earliest possible entry point (3e162c2), closes #24