Allow underscores in righthand side record content
Merge branch 'hotfix/1.2.2'