Merge branch 'pr/1028'

Trying to see if I can correct the commit log...I manually merged a branch but accidentally created an ugly "resolve merge conflict" commit