Merged branch dev-0.4