3504 Conditional boundaries

…