Cross merge from master to Revit2015 for PR #2736