master: updated to reflect the change from bug-5