Merge branch 'main' into 102-pixel-reporting