Cherry-picked changes not including new cavity features due to mkl dependencies Changes: - Fix setting RCAV macro (ICSHWI-18027)
Cherry-picked changes not including new cavity features due to mkl dependencies Changes: - Fix setting RCAV macro (ICSHWI-18027)