ACIK fix and custom request headers

let's not check-in this into dev, will remove it.