Merge "Remove code duplications"