Merge with Rikomagic code snapshot