added first commit to hotfix 5
added secure urls
fixed rebase conflict