Merge "Cortex_hercules: Add support for Hercules-AE" into integration