[BUG #8407] introduce separator
[BUG #8407] add some tests