diff --git a/.travis.yml b/.travis.yml
index c9471a23..c61fc0bb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,7 +6,7 @@ rvm:
 gemfile:
   - gemfiles/Gemfile.rails-5.0.6
   - gemfiles/Gemfile.rails-5.1.4
-  - gemfiles/Gemfile.rails-edge
+  - gemfiles/Gemfile.rails-5.2-stable
 env:
   global:
     - DB=postgresql
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 35a50186..e181a283 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,8 +1,8 @@
 # TODOs
 
+- Localization support: to be able to use localization for all the model labels
 - Add support for pundit
 - Add support for her ORM
-- Localization support: to be able to use localization for all the model labels
 - Add lint check for stylesheet (maybe..)
 - Data audit (use papertrail) (maybe..)
 - Batch data action (maybe..)
@@ -13,6 +13,15 @@ N/A
 
 # History:
 
+## 5.1.5
+
+1. [Chore] Simplify 'resources/show/_image.html.erb' ([issue 80](#80))
+2. [Chore] Add more information to the type validation message ([issue 81](#81))
+3. [Feature] Be able to customize hint in form view ([issue 82](#82))
+4. [Fix] Link of Strong Parameters ([issue 84](#84))
+5. [Fix] Restrict font-awesome-sass version to 5 and below ([issue 85](#85))
+6. [Chore] Reload should be triggered in `to_prepare` instead of `ResourcesRouter` ([issue 86](#86))
+
 ## 5.1.4
 
 1. Chore: Only use resource_params for create and update action ([issue 73](#73))
diff --git a/Gemfile.lock b/Gemfile.lock
index 89edc32b..84efddd1 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    wallaby (5.1.4)
+    wallaby (5.1.5)
       bootstrap-sass
       bootstrap3-datetimepicker-rails
       cancancan
@@ -61,7 +61,7 @@ GEM
       tzinfo (~> 1.1)
     arel (8.0.0)
     ast (2.3.0)
-    autoprefixer-rails (8.0.0)
+    autoprefixer-rails (8.1.0)
       execjs
     bcrypt (3.1.11)
     better_errors (2.4.0)
@@ -225,7 +225,7 @@ GEM
     rainbow (2.2.2)
       rake
     rake (12.3.0)
-    rb-fsevent (0.10.2)
+    rb-fsevent (0.10.3)
     rb-inotify (0.9.10)
       ffi (>= 0.5.0, < 2)
     require_all (1.4.0)
diff --git a/gemfiles/Gemfile.rails-5.0.6 b/gemfiles/Gemfile.rails-5.0.6
index 8b95a689..e6498bf4 100644
--- a/gemfiles/Gemfile.rails-5.0.6
+++ b/gemfiles/Gemfile.rails-5.0.6
@@ -33,7 +33,7 @@ group :development, :test do
   gem 'rails-controller-testing'
   gem 'rails_best_practices'
   gem 'rspec-rails'
-  gem 'rubocop'
+  gem 'rubocop', '0.52.0'
   gem 'simplecov'
   gem 'sqlite3'
 end
diff --git a/gemfiles/Gemfile.rails-5.1.4 b/gemfiles/Gemfile.rails-5.1.4
index 8f4a19cb..95e4334f 100644
--- a/gemfiles/Gemfile.rails-5.1.4
+++ b/gemfiles/Gemfile.rails-5.1.4
@@ -33,7 +33,7 @@ group :development, :test do
   gem 'rails-controller-testing'
   gem 'rails_best_practices'
   gem 'rspec-rails'
-  gem 'rubocop'
+  gem 'rubocop', '0.52.0'
   gem 'simplecov'
   gem 'sqlite3'
 end
diff --git a/gemfiles/Gemfile.rails-edge b/gemfiles/Gemfile.rails-5.2-stable
similarity index 97%
rename from gemfiles/Gemfile.rails-edge
rename to gemfiles/Gemfile.rails-5.2-stable
index cbed8d86..c507046f 100644
--- a/gemfiles/Gemfile.rails-edge
+++ b/gemfiles/Gemfile.rails-5.2-stable
@@ -33,7 +33,7 @@ group :development, :test do
   gem 'rails-controller-testing'
   gem 'rails_best_practices'
   gem 'rspec-rails'
-  gem 'rubocop'
+  gem 'rubocop', '0.52.0'
   gem 'simplecov'
   gem 'sqlite3'
 end
diff --git a/lib/helpers/wallaby/form_helper.rb b/lib/helpers/wallaby/form_helper.rb
index 899264cd..deabe7a5 100644
--- a/lib/helpers/wallaby/form_helper.rb
+++ b/lib/helpers/wallaby/form_helper.rb
@@ -42,6 +42,11 @@ def polymorphic_options(metadata, wildcard = 'QUERY', select_options = {})
       options_for_select options, select_options
     end
 
+    # To fetch the hints from the following keys:
+    # - hints.#{type}_html
+    # - hints.#{type}
+    # @param metadata [Hash]
+    # @return [String, nil] HTML
     def hint_of(metadata)
       type = metadata[:type]
       hint = metadata[:hint]
diff --git a/lib/wallaby/version.rb b/lib/wallaby/version.rb
index 9ae5950c..f50f3689 100644
--- a/lib/wallaby/version.rb
+++ b/lib/wallaby/version.rb
@@ -1,3 +1,3 @@
 module Wallaby
-  VERSION = '5.1.4'.freeze
+  VERSION = '5.1.5'.freeze
 end