User's fixed without tests
Merge origin/master