Backport inheritance handling to RXUI 5.4