#16063525 - add and update checks
