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