Merge "refactor out code duplication"