ticket:1 corrections according to remarks in the ticket
ticket:1 merge to master