Merge "Fix stacking without preconfigured DATABASE_PASSWORD"