Merge "Fix broken window flag" into oc-mr1-dev