Issue finished
Merge branch 'APD-5' into develop
Merged new branch APD-5