The issue was fixed with the push for 8150829; this changeset adds tests. Reviewed-by: psandoz
Reviewed-by: redestad