fixing context for hasActivePanel
merge