Merge branch 'add_complete_hike_feature'