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