tag entity + login fix
Merge branch 'BridgeManager' into Dev