Added AOGP-Devices Organisation Compatibility