B-3421/TK-2121: demo commit