Enhance conditions#3

peter279k wants to merge 2 commits intobrick:masterbrick/std:masterfrom

peter279k:enhance_conditionpeter279k/std:enhance_conditionCopy head branch name to clipboard