Merge "Cleanup implementation of REST views"