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