New branch for conditions work from clean copy of current trunk.