push recent merge from spacial pooler branch