Cross merge changes to Revit2015

@Randy-Ma please help to review the change.