Merged changes from rel-1-2