Merged ARM branch
Upstream fix
Added [pytacle]