Merge "Catalyst framework integration" into main