Merge stf updates from HEAD.