merging changes from SmartBody main tree