Merge "Extract common code to a lib (4/n)"