Closes #1258 & adds additional support for #1246