Merge "Fix baremetal endpoint position"