diff --git a/build-system/pom.xml b/build-system/pom.xml
index ab4a8456142..05ab1b318a9 100644
--- a/build-system/pom.xml
+++ b/build-system/pom.xml
@@ -65,7 +65,7 @@
         <h2.version>1.3.171</h2.version>
         <jdbc.postgres>9.1-901.jdbc4</jdbc.postgres>
         <jdbc.mysql>5.1.25</jdbc.mysql>
-        <wicket.version>6.14.0</wicket.version>
+        <wicket.version>6.15.0</wicket.version>
         <groovy.version>1.8.6</groovy.version>
         <activiti-engine.version>5.15.1</activiti-engine.version>
         <activiti-spring.version>5.15.1</activiti-spring.version>
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/menu/top/LocalePanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/menu/top/LocalePanel.java
index bac6717ac25..53323f43ae8 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/menu/top/LocalePanel.java
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/menu/top/LocalePanel.java
@@ -90,7 +90,7 @@ public LocalePanel(String id) {
         setRenderBodyOnly(true);
 
         final IModel<LocaleDescriptor> model = new Model(getSelectedLocaleDescriptor());
-        Select<LocaleDescriptor> select = new Select<LocaleDescriptor>(ID_SELECT, model);
+        Select<LocaleDescriptor> select = new Select<>(ID_SELECT, model);
         select.add(new AjaxFormComponentUpdatingBehavior("onchange") {
 
             @Override
@@ -110,12 +110,13 @@ public String getDisplayValue(LocaleDescriptor object) {
 
                     @Override
                     public IModel<LocaleDescriptor> getModel(LocaleDescriptor value) {
-                        return new Model<LocaleDescriptor>(value);
+                        return new Model<>(value);
                     }
                 }) {
 
+
             @Override
-            protected SelectOption newOption(String text, IModel<LocaleDescriptor> model) {
+            protected SelectOption<LocaleDescriptor> newOption(String text, IModel<? extends LocaleDescriptor> model) {
                 SelectOption option = super.newOption("&nbsp;" + text, model);
                 option.add(new AttributeModifier("data-icon", "flag-" + model.getObject().getFlag()));
 
diff --git a/gui/admin-gui/src/main/webapp/WEB-INF/web.xml b/gui/admin-gui/src/main/webapp/WEB-INF/web.xml
index 6a20b439660..9619c104815 100644
--- a/gui/admin-gui/src/main/webapp/WEB-INF/web.xml
+++ b/gui/admin-gui/src/main/webapp/WEB-INF/web.xml
@@ -71,8 +71,8 @@
         <filter-class>org.apache.wicket.protocol.http.WicketFilter</filter-class>
         <init-param>
             <param-name>configuration</param-name>
-              <!--<param-value>development</param-value>-->
-            <param-value>deployment</param-value>
+              <param-value>development</param-value>
+            <!--<param-value>deployment</param-value>-->
         </init-param>
         <init-param>
             <param-name>applicationBean</param-name>
@@ -117,7 +117,6 @@
         <!--<init-param>-->
             <!--<param-name>configuration</param-name>-->
             <!--<param-value>development</param-value>-->
-            <!--&lt;!&ndash;<param-value>deployment</param-value>&ndash;&gt;-->
         <!--</init-param>-->
         <!--<init-param>-->
             <!--<param-name>applicationBean</param-name>-->
@@ -152,7 +151,7 @@
             <!--<param-value>org.apache.wicket.atmosphere.TrackMessageSizeFilter</param-value>-->
         <!--</init-param>-->
         <!--<load-on-startup>1</load-on-startup>-->
-        <!--&lt;!&ndash;<async-supported>true</async-supported> supported in servlet 3.0 (tomcat 7) &ndash;&gt;-->
+        <!--<async-supported>true</async-supported> supported in servlet 3.0 (tomcat 7) -->
     <!--</servlet>-->
     <!--<servlet-mapping>-->
         <!--<servlet-name>Atmospherefilter</servlet-name>-->