Review how this is handled in the pending v6.14 update being worked on, and see if the process can be automated or better optimized.