MT#9177 Bootstrap_uri logic and fixes.