I'm closing this issue now as my current issue isn't related anymore to the initial one. I'm going to create a new ticket for it instead.