Merge pull request #3051 from martin-frbg/rocketlake