Merge "Fix recurisve call to onAssociationCompleted"