Merge in wlaurance development from Oct 31