Merge "Add kelvin SW test target"