*8148* Centralize step 3 handler