MODE-1820: Fix PR