Merging changes from pulasthi master