Merge branch '1075-cookie-only-saved-for-current-session-again' into...

Merge branch '1075-cookie-only-saved-for-current-session-again' into 1076-remove-data-between-five-minute-steps-for-count-script