Merged nice dashboard cleanup changes into v1.65