Merge "move duplicate code to common"