3.4.6
Fixed #710. Added new tests to get rewrite to pass
3.4.7