[design] Integrated work from drogue-poc