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