8th july work
Merge branch '8th_july' into development