Implements MOTM-528