Merge "Rename set/get-ConserveMemory" into pi-dev