Merge in fixes for 6974