Merge "Fix issue with docker_module interpolation"