Update from upstream

…to be compatible with R16B