t658 formulae are being supported too. Thanks to God for His Support
Merge branch 't658' into resolved