* backport of commit d77048f1ea7136af9f627182bc79126f9472a060 * backport of commit 301de5980e7fcc8d68d16e6cdcbd5b2afea73711 * backport of commit 436bcda5ec58abbc5a65f6d244a1e1ec26beb46c --------- Co-authored-by: Ronald Ekambi <ronekambi@gmail.com>