Transfer from MatrixPilot SVN trunk version 3083