Merge "Do not override odlparent properties"