add Apollo
Merge remote branch 'origin/jb4.2' into jb4.2