[sprint 49 resolved issues vivek changes aug_28_13]
[some remaining changes]