Merge branch 'sprint4Bogdan' into sprint4.