Case #4128 and #4122 - indicator registry