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