internal public for 5-0-stable