Resolve many issues scheduled for v1.3.1