META-501 latest changes based on GPM's direction
META-501 latest changes based on GPM's direction