Update to AGP 3.6

TLDR:


changes: