re-adding some mistakenly deleted files during cleanup
cleaned-up "CONDITION_ALL" fix