Uri Path building in Message init
Merged conflicts