FITWD-23: Updating contrib modules so that we are compatible for PHP8 update.