Merge "config-init time optimization"