Update to upstream version '3.36.2+64+ge74e691d' with Debian dir f31e0a88d4a72c7caff4857d32fadb1bdb4950ec