... I'm committing the below. Tested x86_64-linux.

Thanks,
Paolo.

/////////////////