Merge "bug fix: restore support for broken flag am: 8d009afdbb  -s ours am: fecadf319e  -s ours" into oc-mr1-dev