Merge "Change associate return type to void" into sc-dev