[REVIEW] Bugfix/540 clickjacking protection