Diff for A/8cf04a9734132302f96da8e113e80ce5 (Commits: e01eb8, e01eb8, Removing prior association method. )