includes akami fix from orenf/akami

0e61ad5d9bf1a8417d4632a16f22bd6c509b9b70
v2.2.1