Merged RestApiBundle back into Janus