Bringing Nicotine based e jucies and vaping batteries

Hi
When I plan to move to Canada,

1.Can i also bring vaping e-juice which contains Nicotine?
2. Can I also bring Li-on batteries which are used in the e-cigs?

I read the https://www.cbsa-asfc.gc.ca/publications/cn-ad/cn18-05-eng.html document in detail. However, I am confused about the e-juice and batteries part.

Please let me know if anybody carried while entering Canada the first time.
Thanks
a_v