FR: now up-to-date with 8e44fa9