diff --git a/Dockerfile-msphpsql b/Dockerfile-msphpsql
index 7de26f1f8..b7334a9bd 100644
--- a/Dockerfile-msphpsql
+++ b/Dockerfile-msphpsql
@@ -45,7 +45,9 @@ RUN export DEBIAN_FRONTEND=noninteractive && apt-get update && ACCEPT_EULA=Y apt
 ENV PATH="/opt/mssql-tools/bin:${PATH}"	
 
 #install coveralls
-RUN pip install --upgrade pip && pip install cpp-coveralls
+#RUN pip install --upgrade pip && pip install cpp-coveralls
+# TODO: Remove this workaround due to https://github.com/pypa/pip/issues/5240
+RUN pip install --upgrade pip==9.0.3 && pip install cpp-coveralls
 
 #Either Install git / download zip (One can see other strategies : https://ryanfb.github.io/etc/2015/07/29/git_strategies_for_docker.html )
 #One option is to get source from zip file of repository.
diff --git a/appveyor.yml b/appveyor.yml
index d7f817d67..e1b0763f8 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -96,13 +96,13 @@ install:
         $client = New-Object Net.WebClient;
         $client.Headers.Add("user-agent", "appveyor-ci-build3");
         $client.DownloadFile("http://windows.php.net/downloads/releases/php-" + ${env:PHP_VERSION} + "-src.zip", ${env:APPVEYOR_BUILD_FOLDER} + "\..\php.zip");
-    - echo Downloading MSODBCSQL 13.1
+    - echo Downloading MSODBCSQL 17.1
     # AppVeyor build works are x64 VMs and 32-bit ODBC driver cannot be installed on it
-    - ps: (new-object net.webclient).DownloadFile('https://download.microsoft.com/download/D/5/E/D5EEF288-A277-45C8-855B-8E2CB7E25B96/x64/msodbcsql.msi', 'c:\projects\msodbcsql.msi')
-    - cmd /c start /wait msiexec /i "c:\projects\msodbcsql.msi" /q
+    - ps: (new-object net.webclient).DownloadFile('https://download.microsoft.com/download/E/6/B/E6BFDC7A-5BCD-4C51-9912-635646DA801E/msodbcsql_17.1.0.1_x64.msi', 'c:\projects\msodbcsql_17.1.0.1_x64.msi')
+    - cmd /c start /wait msiexec /i "c:\projects\msodbcsql_17.1.0.1_x64.msi" /q IACCEPTMSODBCSQLLICENSETERMS=YES ADDLOCAL=ALL
     - echo Checking the version of MSODBCSQL
-    - reg query "HKLM\SOFTWARE\ODBC\odbcinst.ini\ODBC Driver 13 for SQL Server"
-    - dir C:\Windows\System32\msodbcsql13.dll
+    - reg query "HKLM\SOFTWARE\ODBC\odbcinst.ini\ODBC Driver 17 for SQL Server"
+    - dir %WINDIR%\System32\msodbcsql*.dll
     - cd c:\projects
     - 7z x -y .\php-sdk-binary-tools-20110915.zip -o%PHP_SDK%
     - 7z x -y .\php.zip -o%PHP_SDK_DIR%
diff --git a/issue_template.md b/issue_template.md
index 155e1ca13..dc39a3dba 100644
--- a/issue_template.md
+++ b/issue_template.md
@@ -1,27 +1,20 @@
+.+Please check the [FAQ (frequently-asked questions)](https://github.com/Microsoft/msphpsql/wiki/FAQ) first. If you have other questions or something to report, please address the following:
 
- +## Driver version or file name
- +Please tell us what the PHP driver version or file name is.
+ +## PHP Driver version or file name
  +
  +## SQL Server version
- +Please tell us what the SQL Server version is.
  +
  +## Client operating system
- +Please tell us what oprating system the client program is running on.
  +
  +## PHP version
- +Please tell us which version of PHP you are running.
  +
  +## Microsoft ODBC Driver version
- +Please tell us which version of the Microsoft ODBC Driver you are using.
  +
  +## Table schema
- +Please tell us the table schema
  +
  +## Problem description
- +Please share more details with us.
  +
  +## Expected behavior and actual behavior
- +Please tell us what should happen and what happened instead
  +
- +## Repro code
- +Please share repro code with us, or tell us how to reproduce the issue.
+ +## Repro code or steps to reproduce
+ 
\ No newline at end of file