CON-1707: Use debounce