Pull in changes from common to exclude json from model_to_dict
Bug fix.  Using incorrect decorator.