Security issues

Statuses:

Bug Status Commit(s) in security branch
71610 Fixed eaf4e77190d402ea014207e9a7d5da1a4f3727ba
71637 Fixed 57b997ebf99e0eb9a073e0dafd2ab100bd4a112d