Merge stacked space and history changes into develop

Brings the stacked change request and version history work (#893 to #896) into develop.