Topics #18081 (closed) and #18082 (closed) are the principal drivers for these changes, with some additional items under general cleanup.