[[ Bug 12708 ]] Update the weak window creation (popups fall into this category as well)
Merge remote-tracking branch 'sebastien/bugfix-12708-fix' into bugfix-12708
Merge branch 'bugfix-12708' into develop