imported changes from meteor latest release