merge from amd-64 branch: