Conflict resolving
Merge remote-tracking branch 'origin/heromaster' into development