Merge "Upgrade to version 7.2.1"