More comments added for work in progress
Merge branch 'wviljoendev' into develop
More comments added for work in progress