Merge "Add https support in A1 controller"