Merge back changes from newscoop official repo