diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 31fd1149..4f0728dd 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -14,7 +14,7 @@ jobs:
     name: "Build ${{ matrix.platform }}"
     strategy:
       matrix:
-        platform: [windows-latest, ubuntu-18.04, ubuntu-20.04, macos-latest]
+        platform: [windows-latest, ubuntu-20.04, ubuntu-22.04, macos-latest]
     env:
       PARALLEL: -j 2
 
diff --git a/reference/shaders-hlsl-no-opt/asm/frag/vec4-straddle-packing-holes.asm.frag b/reference/shaders-hlsl-no-opt/asm/frag/vec4-straddle-packing-holes.asm.frag
new file mode 100644
index 00000000..a73ce641
--- /dev/null
+++ b/reference/shaders-hlsl-no-opt/asm/frag/vec4-straddle-packing-holes.asm.frag
@@ -0,0 +1,26 @@
+cbuffer type_Test : register(b0)
+{
+    float3 Test_V0_xyz_ : packoffset(c0);
+    float2 Test_V1_zw : packoffset(c1.z);
+};
+
+
+static float4 out_var_SV_Target;
+
+struct SPIRV_Cross_Output
+{
+    float4 out_var_SV_Target : SV_Target0;
+};
+
+void frag_main()
+{
+    out_var_SV_Target = float4(Test_V0_xyz_, Test_V1_zw.x);
+}
+
+SPIRV_Cross_Output main()
+{
+    frag_main();
+    SPIRV_Cross_Output stage_output;
+    stage_output.out_var_SV_Target = out_var_SV_Target;
+    return stage_output;
+}
diff --git a/shaders-hlsl-no-opt/asm/frag/vec4-straddle-packing-holes.asm.frag b/shaders-hlsl-no-opt/asm/frag/vec4-straddle-packing-holes.asm.frag
new file mode 100644
index 00000000..38af5ec4
--- /dev/null
+++ b/shaders-hlsl-no-opt/asm/frag/vec4-straddle-packing-holes.asm.frag
@@ -0,0 +1,52 @@
+; SPIR-V
+; Version: 1.0
+; Generator: Google spiregg; 0
+; Bound: 29
+; Schema: 0
+               OpCapability Shader
+               OpMemoryModel Logical GLSL450
+               OpEntryPoint Fragment %PSMain "main" %out_var_SV_Target
+               OpExecutionMode %PSMain OriginUpperLeft
+               OpSource HLSL 600
+               OpName %type_Test "type.Test"
+               OpMemberName %type_Test 0 "V0_xyz_"
+               OpMemberName %type_Test 1 "V1___zw"
+               OpName %Test "Test"
+               OpName %out_var_SV_Target "out.var.SV_Target"
+               OpName %PSMain "PSMain"
+               OpDecorate %out_var_SV_Target Location 0
+               OpDecorate %Test DescriptorSet 0
+               OpDecorate %Test Binding 0
+               OpMemberDecorate %type_Test 0 Offset 0
+               OpMemberDecorate %type_Test 1 Offset 24
+               OpDecorate %type_Test Block
+        %int = OpTypeInt 32 1
+      %int_0 = OpConstant %int 0
+      %float = OpTypeFloat 32
+    %v3float = OpTypeVector %float 3
+    %v2float = OpTypeVector %float 2
+  %type_Test = OpTypeStruct %v3float %v2float
+%_ptr_Uniform_type_Test = OpTypePointer Uniform %type_Test
+    %v4float = OpTypeVector %float 4
+%_ptr_Output_v4float = OpTypePointer Output %v4float
+       %void = OpTypeVoid
+         %15 = OpTypeFunction %void
+%_ptr_Uniform_v3float = OpTypePointer Uniform %v3float
+%_ptr_Uniform_float = OpTypePointer Uniform %float
+       %Test = OpVariable %_ptr_Uniform_type_Test Uniform
+%out_var_SV_Target = OpVariable %_ptr_Output_v4float Output
+       %uint = OpTypeInt 32 0
+     %uint_1 = OpConstant %uint 1
+     %PSMain = OpFunction %void None %15
+         %18 = OpLabel
+         %19 = OpAccessChain %_ptr_Uniform_v3float %Test %int_0
+         %20 = OpLoad %v3float %19
+         %21 = OpAccessChain %_ptr_Uniform_float %Test %uint_1 %int_0
+         %22 = OpLoad %float %21
+         %23 = OpCompositeExtract %float %20 0
+         %24 = OpCompositeExtract %float %20 1
+         %25 = OpCompositeExtract %float %20 2
+         %26 = OpCompositeConstruct %v4float %23 %24 %25 %22
+               OpStore %out_var_SV_Target %26
+               OpReturn
+               OpFunctionEnd