LP#1830972: update pin and add comments about keeping things in sync