Merge "Remove list item in error case" into devel/master