Merge branch 'ensure-logout-double-invalidate' into develop