Merge release 0.4 Public Beta from testing