Cleanup
Merge remote-tracking branch 'origin/bugs/160' into develop