[Module Tag script: presencestate 12.0.1]
Merge branch 'develop' into release/12.0
combine the two functions so there arent double calls