Merge View from master to dev