1625 round2 library audits

Contains audits #1625, #1626, #1651. This was moved from release 15 to 17 but it's ready now.