Merge "Factor common code"