Merge branch 'backport-ninja-lwyu-ar' into ninja-lwyu-ar