Merging bug fix from rel-1-2