Merged in changes from master's views and models