Merge "Fixed selfManaged call issue" into pi-dev