Yes, this is added in in my PR for #1482 also.