Assigned to Portland Bugs
Link to original bug (#7837)
needs investingation, needs test coverage
Version: beta2