Issue #2330057: Convert to app