HMD 1597 changes 1