Merge "Pattern entry views should be consistent" into oc-mr1-dev