Merge "Expose API for heavy-weight apps and get it working again."