Cortex tuning.
Merge remote branch 'halaszk/master'