Thank you so much for this! This issue has been driving me insane and I am glad someone finally made a solution for this. This is saving me hours from trying to manually fix issues with AO and curvature bakes.
