Merge pull request #791 from clebertsuconic/Branch_2_2_EAP

shared subscription and preventing XA weird race