Merging changes for ST3