Druval CR

#1318707

@druvalcr