UPdated way link with/without entitlements works to try and work around safari issue
Merge branch 'newdev' into test