Add the ability to turn off adding metric suffixes (#905)

Add the ability to turn off adding metric suffixes (#905) #704