GONRG-3107: Change backward compatibility

2 jobs for GONRG-3107_Change_backward_compatibility_logic