Prepare release
Closes #1242
Prepare release
Fix skip condition
Merge branch '4.0' into 4.1