Sync with xmj linux ports