Revert "ver 4.1.1"

This reverts commit acf8390f7d7c9d31e7afcd309e7b8a1ac8078aab.
Revert "Revert "ver 4.1.1""

This reverts commit aaf84d38ebfc8f6415414b0762ee35ff58ccba10.
Merge tag '4.2.2'
fix merge conflicts from previous commit