Manually merged clear7 branch