Merge "Merge "Extension of time" am: 1f6dec06f4" into main-16k