JARVIS-495 early work on 3.4