bug fix
Merge remote-tracking branch 'origin/development' into mic_branch
big fix trello