Sync with changes made at devkit