#16923 Refactoring InterkassaController