Merge "Fix Set and Get InputPanelData()" into devel/master