Closes #3611 Closes #2588 Closes #2499 Signed-off-by: Joshua Castle <26531652+Kas-tle@users.noreply.github.com>