[non-BE] Port Flp MR 2040 to main - "JBM and DTX interaction not as expected" Closes #2073 See merge request !2328