Revert changes from recent commits in develop to clean history and keep only iframe crash fix

Gandalfrequested to merge
develop-revert-cleanup into develop

Merge request reports