TRUNK-4286: Proposed changes done and liquibase changeset added