Issue #2330057: add various modules as apps