Merge "Fix issue #28250286: Missing equals!" into nyc-dev