28997 merge method js

Merging in changed from pairning session with @tylertadej