Bot indicator fixes

Merged HJ requested to merge bot-indicator-fixes into develop

Merge request reports