Upgrade to v7.1.4 and some bug fixes