ticket:4 change way of adding of own context processor
ticket:4 fix merge conflict