Merge commit 'viro/integer-constant'