Merge "Optimize default value loading." into main