Merge branch 'patch/JAL-2976_vaqua4_fallback' into releases/Release_2_10_4_Branch