http://work.netxforge.com/issues/377
http://work.netxforge.com/issues/378
Version 1.1.6