Merge pull request #662 from komeda-shinji/fix-config-oracle