Merge changes from fht