Merge "Finish incomplete merge"