Issue #2330057: convert to app