fixed #1019. All test cases in ConstVolatile are green now
Merge remote-tracking branch 'origin/master'