Few more internal review suggestion applied as preparation for a potential V13 or as patches after upstreaming.