merge branch intoViews

merge branch intoViews