Merge "base: fix out of date documentation with PropertySet()"