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