chore(*): #1021, #1023 - prepare for 4.0.1 release
chore(*): update after additional 4.0.1 changes