Issues have been resolved (24/29)

Issues have been resolved