opened PR/82 that bring the port up-to-date with latest beta-6 changes and brings it in feature parity with the objc-version