Merge "Fix bugs in bind configuration"