merge from master + time mods