Merge branch 'remitamine-akamai_pv'