#9 Tested and documented new feature