CIVI-13 Bug fix and version support tag