Ready to merge v1.41