Merge "Fix default behavior for DatabaseResourceAssignmentProcessor"