Merging changes regarding certificate loading into dev branch.