Improve getRequestedIncludesWithOptions and filter requested includes against available.
Merged differences