bug #95351, #95361
fixed bugs according to ticket
bug #95011
increased version counter