Automatic merge from submit-queue (batch tested with PRs 50300, 50328, 50368, 50370, 50372) correct the allocated element number of pod selectable field set a little fix to correct the allocated element number of pod selectable field set