Merge "Temporarily add support for conditional modules"