Bring in cmomon changes from stegfs