Applied the fix for grw signal from the main branch and the fix for the testbench also.