diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3bd11c0be..f700d1b1f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -28,6 +28,11 @@
 
 26.05.2015
 
+* Added separate data update, all data migration locate at db/data, more info 'rake -T data'
+
+29.05.2015
+
+* Removed old 'iptables_counter_update_command' and added 'iptables_counter_enabled'
 * Updated deploy script, now staging comes from staging branch
 
 25.05.2015
diff --git a/Gemfile.lock b/Gemfile.lock
index 13ad87414..463b6afad 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -87,7 +87,7 @@ GEM
       actionpack
       activesupport (>= 3.0.0)
       rspec
-    autoprefixer-rails (5.2.0)
+    autoprefixer-rails (5.2.0.1)
       execjs
       json
     axiom-types (0.1.1)
@@ -235,7 +235,7 @@ GEM
     hpricot (0.8.6)
     html5_validators (1.2.0)
     httpclient (2.6.0.1)
-    httpi (2.4.0)
+    httpi (2.4.1)
       rack
     i18n (0.7.0)
     ice_nine (0.11.1)
@@ -244,7 +244,7 @@ GEM
     jbuilder (2.2.16)
       activesupport (>= 3.0.0, < 5)
       multi_json (~> 1.2)
-    jquery-rails (4.0.3)
+    jquery-rails (4.0.4)
       rails-dom-testing (~> 1.0)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
@@ -262,15 +262,13 @@ GEM
       addressable (~> 2.3)
     libv8 (3.16.14.7)
     libxml-ruby (2.8.0)
-    listen (2.10.0)
+    listen (2.10.1)
       celluloid (~> 0.16.0)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
     loofah (2.0.2)
       nokogiri (>= 1.5.9)
     lumberjack (1.0.9)
-    macaddr (1.7.1)
-      systemu (~> 2.6.2)
     mail (2.6.3)
       mime-types (>= 1.16, < 3)
     method_source (0.8.2)
@@ -289,7 +287,7 @@ GEM
       monetize (~> 1.1.0)
       money (~> 6.5.0)
       railties (>= 3.0)
-    multi_json (1.11.0)
+    multi_json (1.11.1)
     multi_xml (0.5.5)
     newrelic_rpm (3.9.9.275)
     nokogiri (1.6.6.2)
@@ -298,7 +296,7 @@ GEM
     nprogress-rails (0.1.6.7)
     open4 (1.3.4)
     orm_adapter (0.5.0)
-    parser (2.2.2.5)
+    parser (2.3.0.pre.2)
       ast (>= 1.1, < 3.0)
     pdfkit (0.6.2)
     pg (0.18.2)
@@ -322,7 +320,7 @@ GEM
       erubis
       que (~> 0.8)
       sinatra
-    rack (1.6.1)
+    rack (1.6.4)
     rack-accept (0.4.5)
       rack (>= 0.4)
     rack-mount (0.8.3)
@@ -427,14 +425,13 @@ GEM
       sprockets (>= 2.8, < 4.0)
       sprockets-rails (>= 2.0, < 4.0)
       tilt (~> 1.1)
-    savon (2.11.0)
+    savon (2.11.1)
       akami (~> 1.2)
       builder (>= 2.1.2)
       gyoku (~> 1.2)
       httpi (~> 2.3)
       nokogiri (>= 1.4.0)
       nori (~> 2.4)
-      uuid (~> 2.3.7)
       wasabi (~> 3.4)
     sdoc (0.4.1)
       json (~> 1.7, >= 1.7.7)
@@ -470,7 +467,6 @@ GEM
       sprockets (>= 2.8, < 4.0)
     sys-uname (0.9.0)
       ffi (>= 1.0.0)
-    systemu (2.6.5)
     temple (0.6.10)
     terminal-table (1.4.5)
     therubyracer (0.12.2)
@@ -495,8 +491,6 @@ GEM
       rack
       raindrops (~> 0.7)
     uniform_notifier (1.9.0)
-    uuid (2.3.8)
-      macaddr (~> 1.0)
     uuidtools (2.1.5)
     virtus (1.0.5)
       axiom-types (~> 0.1)
diff --git a/app/controllers/registrant/domain_delete_confirms_controller.rb b/app/controllers/registrant/domain_delete_confirms_controller.rb
index 09e3bff58..73d7f21b5 100644
--- a/app/controllers/registrant/domain_delete_confirms_controller.rb
+++ b/app/controllers/registrant/domain_delete_confirms_controller.rb
@@ -8,8 +8,8 @@ class Registrant::DomainDeleteConfirmsController < RegistrantController
     @domain = nil unless @domain.registrant_delete_confirmable?(params[:token])
   end
 
-  # # rubocop: disable Metrics/PerceivedComplexity
-  # # rubocop: disable Metrics/CyclomaticComplexity
+  # rubocop: disable Metrics/PerceivedComplexity
+  # rubocop: disable Metrics/CyclomaticComplexity
   def update
     @domain = Domain.find(params[:id])
     unless @domain.registrant_delete_confirmable?(params[:token])
diff --git a/app/controllers/registrant/sessions_controller.rb b/app/controllers/registrant/sessions_controller.rb
index b495a1a6a..2d8c3013d 100644
--- a/app/controllers/registrant/sessions_controller.rb
+++ b/app/controllers/registrant/sessions_controller.rb
@@ -69,7 +69,8 @@ class Registrant::SessionsController < Devise::SessionsController
   # rubocop: disable Metrics/CyclomaticComplexity
   # rubocop: disable Metrics/MethodLength
   def mid_status
-    client = Digidoc::Client.new
+    endpoint = "#{ENV['sk_digi_doc_service_endpoint']}"
+    client = Digidoc::Client.new(endpoint)
     client.session_code = session[:mid_session_code]
     auth_status = client.authentication_status
 
diff --git a/app/mailers/contact_mailer.rb b/app/mailers/contact_mailer.rb
index 8b443d279..800544b2e 100644
--- a/app/mailers/contact_mailer.rb
+++ b/app/mailers/contact_mailer.rb
@@ -12,7 +12,7 @@ class ContactMailer < ApplicationMailer
 
     emails = []
     emails << [@contact.email, @contact.email_was] if @contact.registrant_domains.present?
-    emails << @contact.domains.map(&:email) if @contact.domains.present?
+    emails << @contact.domains.map(&:registrant_email) if @contact.domains.present?
     emails = emails.uniq
     
     emails.each do |email|
diff --git a/app/models/epp/domain.rb b/app/models/epp/domain.rb
index f978b760f..bca034f52 100644
--- a/app/models/epp/domain.rb
+++ b/app/models/epp/domain.rb
@@ -408,7 +408,7 @@ class Epp::Domain < Domain
     )
   end
 
-  def epp_destroy(frame, user_id, verify=true)
+  def epp_destroy(frame, user_id, verify = true)
     return false unless valid?
 
     if verify && frame.css('delete').attr('verified').to_s.downcase != 'yes'
diff --git a/config.ru b/config.ru
index 4112838a0..4fa72a37f 100644
--- a/config.ru
+++ b/config.ru
@@ -3,10 +3,11 @@
 require ::File.expand_path('../config/environment',  __FILE__)
 run Rails.application
 
-if defined?(PhusionPassenger)
-  PhusionPassenger.on_event(:starting_worker_process) do |forked|
-    if forked
-      Que.mode = :async
-    end
-  end
-end
+# turn automatic que temp off
+# if defined?(PhusionPassenger)
+  # PhusionPassenger.on_event(:starting_worker_process) do |forked|
+    # if forked
+      # Que.mode = :async
+    # end
+  # end
+# end
diff --git a/config/application-example.yml b/config/application-example.yml
index 5703337ce..24a551769 100644
--- a/config/application-example.yml
+++ b/config/application-example.yml
@@ -10,7 +10,6 @@ time_zone: 'Tallinn' # more zones by rake time:zones:all
 # Example: 'Admin, EPP, REPP' will have name 'Admin, EPP, REPP - production' at New Relic.
 new_relic_app_name: 'Admin, EPP, REPP, Registrar, Registrant'
 
-
 # You can use `rake secret` to generate a secure secret key.
 # Your secret key is used for verifying the integrity of signed cookies.
 # If you change this key, all old signed cookies will become invalid!
diff --git a/doc/repp-doc.md b/doc/repp-doc.md
index dbdad9a59..9896f34da 100644
--- a/doc/repp-doc.md
+++ b/doc/repp-doc.md
@@ -1,6 +1,6 @@
 # REPP integration specification
 
-REPP uses HTTP/1.1 protocol (http://www.ietf.org/rfc/rfc2616.txt) and 
+REPP uses HTTP/1.1 protocol (http://tools.ietf.org/html/rfc2616) and 
 Basic Authentication (http://tools.ietf.org/html/rfc2617#section-2) using 
 Secure Transport (https://tools.ietf.org/html/rfc5246) with certificate and key (https://tools.ietf.org/html/rfc5280).
 
diff --git a/lib/tasks/import.rake b/lib/tasks/import.rake
index 69cdb603f..f5c8e409c 100644
--- a/lib/tasks/import.rake
+++ b/lib/tasks/import.rake
@@ -1,3 +1,4 @@
+# rubocop: disable Style/SymbolProc
 namespace :import do
   # README
   #
@@ -712,3 +713,4 @@ namespace :import do
     puts "-----> Imported EIS domains in #{(Time.zone.now.to_f - start).round(2)} seconds"
   end
 end
+# rubocop: enable Style/SymbolProc