added property mapping in ttl
merge develop to csiro-develop