added feature 3
Merge branch 'beforereleasecreated' into dev