Merge changes from topic "odlparent-6.0.1"