Fied conflict with location class
Merge origin/master