Chris nisbet01/issue 1278

This branch was created for manual merging of #1278