Merge branch 'staging' into feat/roman/conviction-lock-support