Bring docker support in line with develop branch