ref: refs/heads/req06-obstacles
