Remove solved issues (#7232, #7131)
Simplify
Add emphasis