Merge "Feature toggle for owning-entities filtering"