Merge "Reduce duplicated code"