Diff for A/1b150205e73c8a1e4cc7dd4a119ec11c (Commits: e01eb8, e01eb8, Removing prior association method. )