merge in changes from master branch

Include index resource filtering for the beta and live profiles