Pulled in changes only related to fixes from newview branch