merged changes from daily session