testing and replacing properties structure
Merge upstream/master
TEMPORAL RED :)