LPS-41340 Apply changes to SMDHs