Merge remote branch 'smcv/ready/transient'