P: Selective objects in Smart Filters gets misaligned after cropping outside of Camera Raw

I always start my editing process with making a Smart filter, and apply the Camera RAW. I edit in here with multiple selective edits (brush tool, gradient, etc.). When I'm done in Camera RAW I close it down and start edit with muliple layers in the normal Photoshop view. 

Whenever I come to my final stages I like to do tweaks to the crop. I do this at the end, with many layers in the layer panel, including the smart layer with camera RAW from the early stages. Whenever the crop render the selective edits from the smart object get misaligned. My work-around is to create a new merged layer before the crop, but that limits my ability to go back and edit again later if I'd want to do that. 

Are there any other work-arounds or will the bug be fixed in the near future? 🙏