Merge "Avoid master queries in loadAndLazyInit() for miser mode"