Merge 0.6.2/waqas with 0.6.2/MattJ