first of all many thanks for your contribution. I think you have made the pull request right and I can see the desired changes. I would like to merge it but it is a bit unfortunate situation at the moment since my colleagues are now merging new radio stack (allowing multiple connections) and this would not have long-term effect in the repository.
I have the following suggestion - if it works for you , it is great, but let's keep the official version as it is and we will try to implement desired functionality with the new stack. Is that fine with you?
Thank you. P.