Merge branch 'feature/myfeat2' into develop

finish myfeat2