Merge "Merge "Fix double bolding" into oc-dev am: 1b7e17b135  -s ours am: e99f3c3c77  -s ours"