Cross merge pull request #2794 to Revit2015