Merge branch 'js/compat-itimer'