Man scraper was breaking too much, reverting for now
Merge branch 'feature/stability' into dev