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