Copying over the changes from #1776 to the new location (assuming #18…

[olemartinorg]

Duplicate of #1776, but changing the newer location of these files instead (the old location will be deleted in #1897)