Title: Hakans F1 part 1
Merge branch 'towards-release-02' into hakan-f-1

Conflicts:
	a.txt
	b.txt
	c.txt
Title: Hakans F1 Part 2
Merge branch 'hakan-f-1' into towards-release-02