Adaptations to 'review' branch needed when merged with 'failoptions' branch