Pull clivem changes into master