RT: 2582, 2850 (cherry picked from commit ca48ace5c52feb0082954fff00a44e1914b9e7e9) Conflicts: Configure