Console updates/bugfixes for metrics
Merge remote-tracking branch 'origin/develop' into develop