Cross merge pull request #2763 to Revit2015