Synchronized with develop
Synchronized with develop
Restored closing in mozilla
Restored closing in mozilla