Merge "BUG-1041 cli proposal #1"