Merge #18932

Merge #18932 with fixes