Merge remote-tracking branch 'smcv/trail'