Merged ARM branch
Upstream fix