Merge "Condense Liquibase steps"