Prepare to merge with devassistant