Part of #2087
Part of #2087