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