Same MR as !3 (merged) (merge was undone due to prod errors)
Error in production build due to passing in function for x-axis data Fixed in 130a1380