#2108 Enforce specifying a context