sync with rfremix-release 18