Expose manager to public interface
Merge branch 'feature-expose-manager' into develop