Cross merge pull request #2800 to Revit2015