CON-924 Changed AM groups and binding