merging recent changes from SmartBody main tree