Accepted all current changes to resolve merge conflicts.
Realised this branch and tdv-PR44-fixed-merge-conflict were actually one commit behind automation.
Cherry-picked the latest commit on this branch.
Merged automation into tdv-PR44-fixed-merge-conflict
Merged tdv-PR44-fixed-merge-conflict, resolving conflicts by accepting current.
Targetted tdv-PR44-fixed-merge-conflict.
I'll use it to leave some review comments, the original branch bmiszalski:bm_work can be updated from automation (Hopefully more cleanly), then this PR can be linked from the other PR and closed.
See #57
This PR is #57, but I:
tdv-PR44-fixed-merge-conflictwere actually one commit behind automation.tdv-PR44-fixed-merge-conflicttdv-PR44-fixed-merge-conflict, resolving conflicts by accepting current.I'll use it to leave some review comments, the original branch
bmiszalski:bm_workcan be updated from automation (Hopefully more cleanly), then this PR can be linked from the other PR and closed.