Merge pull request #5438 from cherusker/cherusker-2017-08-24-complete-prototype