Fix merge problems in persistent licenses functionality caused after merging #2427
Created by: epiclabsDASH
Recover Reference Player changes of PR #2451 that were removed during the merge of PR #2427.
Created by: epiclabsDASH
Recover Reference Player changes of PR #2451 that were removed during the merge of PR #2427.