Feature/2426 fix https