Merge "[PORTAL] Non-root user for back-end database"