Merge "Adding client monitoring module to apex-pdp"