Merged with aihelper-changes branch