I was in a similar situation and came across your thread, you can check my post on how I resolved it for me here: