Merge branch 'fix-noop'