Revert to prior clk settings
Merge branch 'JBX' into JBX_EDISON