SLG4/MacFix: merge with latest changes

--HG--
branch : test_mac_fix_for_slg4
SLG4/MacFix: new round of tests. Test #1

--HG--
branch : test_mac_fix_for_slg4