Updated with Concordion changes since original branch