entity rebind using storage: rebasing to master