Merged dashboard refactor back into v1.61