KULRICE-6064 Minor updates
KULRICE-6064 Minor updates

git-svn-id: 2a5d2b5a02908a0c4ba7967b726d8c4198d1b9ed@36799 7a7aa7f6-c479-11dc-97e2-85a2497f191d

ricepanda/rice,ricepanda/rice,ricepanda/rice,ricepanda/rice