fix and update to RC1 by IMER