#73 #74 #75 structured-content-tools and rivers updated to latest
versions