new CLI modifiers management
back to normal
Merge commit 'c5fa004'