[CONTACT] reducing diff with official branch to the strict minium for maximum compatibility