This PR aims to partially fix #2239 and is intended to replace #2749. It is a work in progress as a few things might need to happen before this is viable (more at the end about this). The main gist...