See CLJ-371

Please post design discussion here.