cherry-picked ConstInt
cherry-picked atomic fixes
[FIX] remove superfluous include