Update 3.0 features IBR and views
resolve merge conflicts