Diff for A/057b4ba9346ca7fa3f4b5a04f7272e92 (Commits: e01eb8, e01eb8, Removing prior association method. )