Preliminary indicator setup
Merge branch 'develop' of https://github.com/ngisolfi/15666 into develop