TYRUS-289: Changes based on a review II