EFTRACK-133: Resolving the remaining threads that were left for another merge request for !56436
Closes the subtask EFTRACK-133 relating to resolving the threads of !56436 (merged) that were said to be handeled in a future merge request. Each thread was considered case-by-case: not all have been implemented.
It is worth noting that a lot of the threads that were left for EFTRACK-133 have already been handeled by previous merge requests - This request closes this subtask.
Edited by Elliot Watton