Greeter refactoring
Merge branch 'greeter_refactoring'