cleanup issues
Merge branch 'master' into dev
issues test #ideas
cleanup