Rebased on master HEAD 5bf7d80535720077aec104a9904480d08b9b4f2b
Fixed some tests on ARM and x86 architectures.

--
Oleg