diff --git a/CHANGELOG.md b/CHANGELOG.md
index 595646d816b..83d56a97bc9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,9 @@
 <!--
 Contains editorialized release notes. Raw release notes should go into `RELEASE-NOTES.txt`.
 -->
+## 21.5
+Get ready for a smoother experience! We’ve optimized receipt scaling, added Puerto Rico for in-person payments, and improved Blaze Campaigns display. Enjoy faster product gallery loading, better bulk order updates, and real-time image upload indicators. Plus, WooPayments onboarding is now easier than ever!
+
 ## 21.4
 This update brings several improvements to the WooCommerce mobile app. Dashboard menus now adapt better to larger fonts, and we've resolved layout issues in Settings. You'll also experience fewer crashes, with fixes for order details, plugin activation, and refunds. Merchants can now bulk update order statuses, barcode scanning is more reliable, and accessing plugin updates is quicker than ever. Additionally, sites can now be hidden from the site picker.
 
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index 426244d61e7..7d657d751cd 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -1,6 +1,10 @@
 *** PLEASE FOLLOW THIS FORMAT: [<priority indicator, more stars = higher priority>] <description> [<PR URL>]
 *** Use [*****] to indicate smoke tests of all critical flows should be run on the final APK before release (e.g. major library or targetSdk updates).
 *** For entries which are touching the Android Wear app's, start entry with `[WEAR]` too.
+21.6
+-----
+
+
 21.5
 -----
 - [**] Enhanced WebView to dynamically scale receipt content, ensuring optimal fit across all device screen sizes. [https://github.com/woocommerce/woocommerce-android/pull/13266]
diff --git a/fastlane/metadata/PlayStoreStrings.pot b/fastlane/metadata/PlayStoreStrings.pot
index 9618310eeaa..758b2bab502 100644
--- a/fastlane/metadata/PlayStoreStrings.pot
+++ b/fastlane/metadata/PlayStoreStrings.pot
@@ -16,18 +16,16 @@ msgid "In this update, we’ve made a few small bug fixes and enhancements to en
 msgstr ""
 
 #. translators: Release notes for this version to be displayed in the Play Store. Limit to 500 characters including spaces and commas!
-msgctxt "release_note_214"
+msgctxt "release_note_215"
 msgid ""
-"21.4:\n"
-"This update brings several improvements to the WooCommerce mobile app. Dashboard menus now adapt better to larger fonts, and we've resolved layout issues in Settings. You'll also experience fewer crashes, with fixes for order details, plugin activation, and refunds. Merchants can now bulk update order statuses, barcode scanning is more reliable, and accessing plugin updates is quicker than ever. Additionally, sites can now be hidden from the site picker.\n"
+"21.5:\n"
+"Get ready for a smoother experience! We’ve optimized receipt scaling, added Puerto Rico for in-person payments, and improved Blaze Campaigns display. Enjoy faster product gallery loading, better bulk order updates, and real-time image upload indicators. Plus, WooPayments onboarding is now easier than ever!\n"
 msgstr ""
 
-msgctxt "release_note_213"
+msgctxt "release_note_214"
 msgid ""
-"21.3:\n"
-"In this update, we've improved the WooCommerce app with several fixes and enhancements. The "One-time shipping" label now correctly matches its availability in Product Subscriptions, and issues with product conversion have been resolved. We've also streamlined the card reader payment flow for faster transactions, fixed a barcode scanner crash, and improved login error handling. Plus, if your site has no products, the Blaze Campaign screen now offers an easy way to create one.\n"
-"\n"
-"-----\n"
+"21.4:\n"
+"This update brings several improvements to the WooCommerce mobile app. Dashboard menus now adapt better to larger fonts, and we've resolved layout issues in Settings. You'll also experience fewer crashes, with fixes for order details, plugin activation, and refunds. Merchants can now bulk update order statuses, barcode scanning is more reliable, and accessing plugin updates is quicker than ever. Additionally, sites can now be hidden from the site picker.\n"
 msgstr ""
 
 #. translators: Short description of the app to be displayed in the Play Store. Limit to 80 characters including spaces and commas!
diff --git a/fastlane/metadata/android/ar/changelogs/default.txt b/fastlane/metadata/android/ar/changelogs/default.txt
deleted file mode 100644
index cc9e14e2e82..00000000000
--- a/fastlane/metadata/android/ar/changelogs/default.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-21.4:
-يقدِّم هذا التحديث العديد من التحسينات على تطبيق WooCommerce للهاتف المحمول. تتكيف قوائم لوحة التحكم بشكل أفضل مع الخطوط الأكبر، وإننا نحل مشكلات التخطيط ضمن الإعدادات. ستواجه أيضًا بعض الأعطال، مع إصلاحات تتعلق بتفاصيل الطلب وتفعيل الإضافة وعمليات استرداد الأموال. يمكن للتجار الآن تحديث حالات الطلب بشكل مجمع، وأصبح مسح الرمز الشريطي ضوئيًا أكثر موثوقية، كما أصبح الوصول إلى تحديثات الإضافات أسرع من أي وقت مضى. إضافة إلى ذلك، يمكن إخفاء المواقع الآن من أداة الانتقاء في الموقع.
diff --git a/fastlane/metadata/android/en-US/changelogs/default.txt b/fastlane/metadata/android/en-US/changelogs/default.txt
index d112fbba67d..21521d130e8 100644
--- a/fastlane/metadata/android/en-US/changelogs/default.txt
+++ b/fastlane/metadata/android/en-US/changelogs/default.txt
@@ -1 +1 @@
-This update brings several improvements to the WooCommerce mobile app. Dashboard menus now adapt better to larger fonts, and we've resolved layout issues in Settings. You'll also experience fewer crashes, with fixes for order details, plugin activation, and refunds. Merchants can now bulk update order statuses, barcode scanning is more reliable, and accessing plugin updates is quicker than ever. Additionally, sites can now be hidden from the site picker.
+Get ready for a smoother experience! We’ve optimized receipt scaling, added Puerto Rico for in-person payments, and improved Blaze Campaigns display. Enjoy faster product gallery loading, better bulk order updates, and real-time image upload indicators. Plus, WooPayments onboarding is now easier than ever!
diff --git a/fastlane/metadata/android/iw-IL/changelogs/default.txt b/fastlane/metadata/android/iw-IL/changelogs/default.txt
deleted file mode 100644
index 5a0b4cd26e5..00000000000
--- a/fastlane/metadata/android/iw-IL/changelogs/default.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-21.4:
-בעדכון הזה אנחנו משיקים מספר שיפורים באפליקציה של WooCommerce לנייד. תפריטים בלוח הבקרה כעת מסתגלים טוב יותר לגופנים גדולים יותר, וגם פתרנו בעיות פריסה ב'הגדרות'. צמצמנו את מספר הקריסות שהמשתמשים נתקלו בהן, הודות לתיקונים בפרטי ההזמנה, בהפעלת תוספים ובהחזרים כספיים. סוחרים יכולים כעת לעדכן סטטוס של כמה הזמנות, סריקת ברקוד כעת יציבה יותר והגישה לעדכוני תוספים מהירה יותר מפעם. בנוסף, עכשיו אפשר להסתיר אתרים בבוחר האתרים.
diff --git a/fastlane/metadata/android/ja-JP/changelogs/default.txt b/fastlane/metadata/android/ja-JP/changelogs/default.txt
deleted file mode 100644
index d5bddd77449..00000000000
--- a/fastlane/metadata/android/ja-JP/changelogs/default.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-21.4:
-今回の更新では、WooCommerce モバイルアプリにいくつかの改良が行われました。ダッシュボードメニューがより大きいフォントに適切に対応できるようになったほか、「設定」のレイアウトに関する問題が解決されました。また、注文の詳細、プラグインの有効化、払い戻しに関する修正により、クラッシュも減少します。販売者は注文ステータスを一括更新できるようになりました。またバーコードスキャンの信頼性が向上したほか、プラグイン更新へのアクセスがこれまで以上に迅速になりました。さらに、サイトピッカーからサイトを非表示にできるようになりました。
diff --git a/fastlane/metadata/android/ko-KR/changelogs/default.txt b/fastlane/metadata/android/ko-KR/changelogs/default.txt
deleted file mode 100644
index 4957da7b139..00000000000
--- a/fastlane/metadata/android/ko-KR/changelogs/default.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-21.4:
-이 업데이트를 통해 우커머스 모바일 앱이 여러모로 개선됩니다. 알림판 메뉴가 이제는 더 큰 글꼴에 더 잘 적응하고, 설정의 레이아웃 문제도 해결되었습니다. 또한 주문 상세 정보, 플러그인 활성화 및 환불에 수정 사항이 적용되어 충돌이 더 적게 발생합니다. 이제는 판매자가 주문 상태를 대량으로 업데이트할 수 있고, 바코드 스캐닝이 더 안정적이며, 이전보다 빠르게 플러그인 업데이트에 접근할 수 있습니다. 아울러 이제는 사이트 선택기에서 사이트를 숨길 수 있습니다.
diff --git a/fastlane/metadata/android/zh-CN/changelogs/default.txt b/fastlane/metadata/android/zh-CN/changelogs/default.txt
deleted file mode 100644
index 83c6bcfbec9..00000000000
--- a/fastlane/metadata/android/zh-CN/changelogs/default.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-21.4：
-在本次更新中，我们对 WooCommerce 移动应用程序进行了多项改进。仪表盘菜单现在能更好地适应大字体，而且我们还解决了“设置”部分的布局问题。我们修复了订单详细信息、插件激活和退款等功能，这样您遇到的崩溃问题也将减少。商家现在可以批量更新订单状态、更准确地扫描条形码，以及更快地访问插件更新。此外，您现在还可以在站点选择器中隐藏站点。
diff --git a/fastlane/metadata/android/zh-TW/changelogs/default.txt b/fastlane/metadata/android/zh-TW/changelogs/default.txt
deleted file mode 100644
index 87fabf20aeb..00000000000
--- a/fastlane/metadata/android/zh-TW/changelogs/default.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-21.4:
-本次更新提升了 WooCommerce 行動應用程式多項功能。儀表板選單的版面現在更能適應更大的字型，「設定」中的版面形式問題也獲得解決。此外，我們修正訂單詳細資料、外掛程式啟用、退款功能的錯誤，讓當機次數大幅減少。商家目前可以批次更新訂單狀態、條碼掃描功能更可靠，存取外掛程式更新的速度也將超乎以往。不僅如此，你可以將網站從網站選擇器中隱藏。
diff --git a/fastlane/resources/values/strings.xml b/fastlane/resources/values/strings.xml
index 4b2aae8fc2e..1ac8ab71ad2 100644
--- a/fastlane/resources/values/strings.xml
+++ b/fastlane/resources/values/strings.xml
@@ -163,7 +163,7 @@
     <string name="receipt_fetching_error">Sorry, we couldn\'t load a receipt for this order</string>
     <string name="store_name_default">Store name</string>
     <string name="sorted_by">Sorted by 1%s</string>
-
+    <string name="add">Add %s</string>
     <!--
         Date/Time Labels
     -->
@@ -619,6 +619,9 @@
     <string name="orderlist_selection_menu_update_status">Update status</string>
     <string name="orderlist_bulk_update_status_updated">Status updated!</string>
     <string name="orderlist_bulk_update_maximum_reached">Maximum selection count (%d) is reached.</string>
+    <string name="orderlist_bulk_update_result_no_orders_updated">No orders updated. Please try again.</string>
+    <string name="orderlist_bulk_update_result_all_failed">Failed to update orders. Please try again.</string>
+    <string name="orderlist_bulk_update_result_partial_success">%d order(s) updated, and %d order(s) failed to update. Please try again.</string>
 
     <!--
          Simple Payments
@@ -1007,9 +1010,7 @@
     <string name="orderdetail_shipping_label_unpackaged_products_header">Remaining products</string>
     <string name="orderdetail_shipping_label_print">Print shipping label</string>
     <string name="orderdetail_shipping_label_wip_title">Print shipping labels from your device!</string>
-    <string name="orderdetail_shipping_label_m2_wip_title">Create shipping labels from your device!!</string>
     <string name="orderdetail_shipping_label_wip_message">We are working on making it easier for you to print shipping labels directly from you device! For now, if you have created shipping labels for this order in your store admin with WooCommerce Shipping, you can print them in your Order Details here.</string>
-    <string name="orderdetail_shipping_label_m3_wip_message">You can now create shipping labels for all physical orders directly from your device with the free WooCommerce Shipping plugin. Tap on "Create shipping label" to try our beta feature!</string>
     <string name="orderdetail_shipping_label_create_shipping_label">Create shipping label</string>
     <string name="orderdetail_shipping_label_notice">Learn more about creating labels with your mobile device</string>
     <string name="orderdetail_custom_fields">Custom fields</string>
@@ -2399,6 +2400,7 @@
     <string name="product_add_photo">Add photo</string>
     <string name="product_replace_photo">Replace photo</string>
     <string name="product_remove_photo">Remove photo</string>
+    <string name="product_cover_photo_tag">Cover</string>
     <string name="product_image_add">Add a product image</string>
     <string name="product_image_error_removing">Error removing product image</string>
     <string name="product_image_service_error_uploading">Error uploading product image</string>
@@ -2418,7 +2420,7 @@
     <string name="media_picker_dialog_title">Select Media Source</string>
     <string name="wpmedia_picker_title">WordPress media library</string>
     <string name="product_images_image_limit_warning">Only one photo can be displayed per product variation</string>
-    <string name="product_images_drag_and_drop_description">Drag and drop to re-order photos</string>
+    <string name="product_images_drag_and_drop_to_reorder">Drag and drop to re-order photos. The first photo will be set as the cover.</string>
     <string name="product_images_validate_drag_and_drop">Validate</string>
     <string name="product_image_service_error_media_null">Media could not be found</string>
     <string name="product_image_service_error_uploading_single">%d file couldn\'t be uploaded</string>
@@ -2654,7 +2656,7 @@
     <string name="enter_username_instead">Log in with your username.</string>
     <string name="enter_verification_code">Almost there! Please enter the verification code for WordPress.com from your authenticator app.</string>
     <string name="enter_verification_code_sms">We sent a text message to the phone number ending in %s. Please enter the verification code in the SMS.</string>
-
+    <string name="login_use_wpcom_username_instead">Use username and password instead</string>
 
     <string name="requesting_otp">Requesting a verification code via SMS.</string>
     <string name="requesting_sms_otp_success">SMS requested, please check your messages for the code.</string>
@@ -4321,7 +4323,7 @@
     <string name="woopos_cart_empty_content_description">Cart is empty</string>
     <string name="woopos_products_empty_list_image_description">No products</string>
     <string name="woopos_products_empty_list_title">No supported products found</string>
-    <string name="woopos_products_empty_list_message">POS currently only supports simple and variable products – \ncreate one to get started.</string>
+    <string name="woopos_products_empty_list_message">POS currently only supports simple, variable, and virtual products – \ncreate one to get started.</string>
     <string name="woopos_products_empty_list_message_two">POS currently only supports simple products</string>
     <string name="woopos_products_loading_error_title">Error loading products</string>
     <string name="woopos_products_loading_error_message">Give it another go?</string>
@@ -4331,6 +4333,11 @@
     <string name="woopos_totals_success_payment_cash">A cash payment of %1$s was successfully made</string>
     <string name="woopos_totals_success_payment_card">A card payment of %1$s was successfully made</string>
 
+    <string name="woopos_variations_empty_list_title">No supported variations found</string>
+    <string name="woopos_variations_empty_list_message">POS currently only supports simple, variable, and virtual products – \ncreate one to get started.</string>
+    <string name="woopos_variations_empty_list_image_description">No variations</string>
+    <string name="woopos_variations_any_variation">Any %s</string>
+
     <string name="woopos_success_totals_error_reader_not_connected_title">Reader not connected</string>
     <string name="woopos_success_totals_error_reader_not_connected_subtitle">To process this payment, please connect your reader.</string>
     <string name="woopos_success_totals_error_reader_not_connected_cta_button_label">Connect to reader</string>
@@ -4346,7 +4353,6 @@
     <string name="woo_pos_payment_failed_try_another_payment_method">Try another payment method</string>
     <string name="woo_pos_payment_failed_try_again">Try payment again</string>
     <string name="woo_pos_payment_failed_go_back_to_checkout">Go back to checkout</string>
-    <string name="woo_pos_payment_remove_card">Remove card</string>
 
     <string name="woopos_floating_toolbar_overlay_menu_content_description">Dimmed background. Tap to close the menu.</string>
     <string name="woopos_floating_toolbar_card_reader_connected_status_content_description">Card reader connected</string>
@@ -4456,4 +4462,15 @@
     <string name="woo_shipping_labels_package_creation_error_proceed">Proceed</string>
     <string name="woo_shipping_labels_package_creation_error_cancel">Cancel</string>
     <string name="email_not_registered_wpcom">Hmm, we can\'t find a WordPress.com account connected to this email address.</string>
+
+    <string name="woo_shipping_edit_origin_address_title">Edit Origin</string>
+    <string name="woo_shipping_label_name">Name</string>
+    <string name="woo_shipping_label_company">Company</string>
+    <string name="woo_shipping_label_country">Country</string>
+    <string name="woo_shipping_label_address">Address</string>
+    <string name="woo_shipping_label_city">City</string>
+    <string name="woo_shipping_label_state">State</string>
+    <string name="woo_shipping_label_post_code">Postal Code</string>
+    <string name="woo_shipping_label_email">Email</string>
+    <string name="woo_shipping_label_phone">Phone</string>
 </resources>
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 3f433c534c6..d02268af96c 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -87,8 +87,8 @@ stripe-terminal = '3.7.1'
 tinder-statemachine = '0.2.0'
 wiremock = '2.26.3'
 wordpress-aztec = 'v2.1.4'
-wordpress-fluxc = 'trunk-657a72d968f89dc2edd6a6e6e57f579643d1e213'
-wordpress-login = 'trunk-706a58b33ff8f1a2858ae64e51204426ec12fe7b'
+wordpress-fluxc = '2.103.0'
+wordpress-login = '1.20.0'
 wordpress-libaddressinput = '0.0.2'
 wordpress-mediapicker = '0.3.1'
 wordpress-utils = '3.15.0'
diff --git a/version.properties b/version.properties
index 79c4f00e652..9771eb4a8d8 100644
--- a/version.properties
+++ b/version.properties
@@ -1,2 +1,2 @@
-versionName=21.4
-versionCode=637
\ No newline at end of file
+versionName=21.5-rc-1
+versionCode=638
\ No newline at end of file