Bypass PR, directly Integrate contributions from  Peb Ruswono Aryan and Claude Huchet - thanks!