Prepare to merge with Pittman

Last merge was a fail — preparing merge