Merge pull request #2300 from GiHoon1123/fix-947-authenticate-options