Merge remote-tracking branch 'origin/guarino' into ts05