Merge "Lazy init property configs." into main