[MERGE] minor improvements on @noupdate