Merge branch 'stable-3.3'

* stable-3.3:
  Introduce an optional configuration to define a regex for naming rules

Change-Id: I620abbb21d9450397f7e344adc66711d80e01dd7