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