updates to the release branch to solve bug with duplicate object association