redo changes for 0.3.38rc1 without eol changes