Since all issues on this epic were resolved, I'm going to mark it as resolved and put the epic status as done. Feel free to reopen it if needs.