Statement store index optimization, state 2b (#12774)