[2990] Update commit [2986]

Also add missing comment