Merge "Changing SMC code for transitioning Granule" into integration