This change has fixed the simple case alignment issues. As you mentioned, only_load cannot handle some of the more complex cases (and one of the reasons I didn't include a PR with the ticket).