Bsongis/logical switches issue 1039