Further changes as per silicon-sr1