Tomography branch merged into develop

Bring develop and feature/sp_validation-extend-to-tomography back to one line: land #253 and #307, merge develop into the tomography branch, promote it to develop, rebase the open children.