Merge remote-tracking branch 'smcv/ready/trail'