Extend format for future use. --HG-- branch : develop
Values in code and the comments were not in sync. (grafted from 319eab782b7cf97c71815d6b8bfaed0d6a0fa5a8) --HG-- branch : develop
--HG-- branch : release