Merge remote-tracking branch 'amarx/core90' into next