Merge "[CDM][Refactoring 7/N] Refactor the association activity" into main