Temporary commit for merge
Merge with branch
Fixed path property error in objects.properties