Merge "Enable bulk icon loading on master"