Merge change sets from hiwanz/master