Base image updates + Catch2