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