Fixes ptf-app-crawler#20 (closed)
Also includes an automatically generated migration from !129 (merged)