DEV-3 commit