Version 2.1.0.31-2226

Some issues were corrected for build 2226