TSP-4673 / TSP-5237 added break in switch, renamed method