MANTA-67 add circular counter
unit test whitespace
misc