Added cookie null check
Merge branch 'm1' into m2