Issue #3117841 by maximpodorov, hgeshev, bircher: Conditionally-split configuration is no longer completely split