Fix #632 - Added switch to allow use of Logical Context to be turned off