Merge "Add side loaded listener and controller" into rvc-dev