Mweb 1043

@nandy-andy @RafLeszczynski @rogatty 
could you move this to general utils?