7.1.2 Final (Final fix for 7.1.2)

See master for commit details.