measurements anymore. (grafted from ca88ea9874acb7e08edafe84ca716e58b6e4b05e) --HG-- branch : develop