Part of #2409
Part of #2409