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