Look at https://bitbucket.org/channelgrabber/cginfrastructure-v4/commits/1f1f7bef81d75b9fb5ff028fdd6470b5cf77b1c0