fix(dirk): condition seperation#2

sambacha wants to merge 3 commits intomainmanifoldfinance/commit-boost-client:mainfrom

dirk-conditionsmanifoldfinance/commit-boost-client:dirk-conditionsCopy head branch name to clipboard