Update according to the OMF6 updates, before the first non --pre release