3.0.4

Chris Shantz

@mnshantz

f331d3fd · Merge branch 'dev' into prod/3.0.x · Sep 17, 2021

Re-tagged to include patch for media so it works with 8.9.19