Merge "we were sometimes not setting fences properly" into jb-mr1-dev