[3818] Changes after review