Hi @damianChapman, upcoming 4.5.1 has an improvement to help this. See following posts for details:
-Prasad