Merge with APM latest code. Tested on HW