Merge "Move the pcm period settings into properties"