Merge "Add support for LoggingOnly changes"