i have similar situation here, but im going back in 2 days before my extension (non-ib) expires. Havent done wp cancellation (not planning to apply wp anysoon) There is re-entry permit in my passport, should i mention it to officer that im not coming back as worker? or is it very clear for them because there is only 2 days left in my visa 😅😆 wish me a luck, going to cross border tomorrow.