fix(): Backports for broken features requests

fix(): Backports for broken features requests #3130