updated 1.4 code - sync branch with our internal stuff