M#501

git-svn-id: http://farmanager.com/svn/trunk@10094 72235d2c-c60c-0410-a47a-a0032694dc5d
more of 3343.2

git-svn-id: http://farmanager.com/svn/trunk@10096 72235d2c-c60c-0410-a47a-a0032694dc5d