Added cookie null check
Merge branch 'm1' into m2
Merge branch 'm2' into m3