Update monolith branch with changes from simplified branch