Feature/api quota support + current_user null pattern