Merge remote branch 'smcv/transient-relative-api'