new index pulled from locker master upstream