fail open fix
bugfix
cleanup
RelatedActivity fixes