Merged v1.65-dashboard-prefilter