SRH- 536

Support for SRH- 536

Code: C646