Merge pull request #3773 from maxonfjvipon/bug/#3691/phy-sugar-tests

Merge pull request #3773 from maxonfjvipon/bug/#3691/phy-sugar-tests #1647