code merge in add_views to master