Merge "Move persistence methods from NCMPproperty handler"