* commit '2dc59d56cbfe90fdae745496038352fdada6ee26': Fix bug 3347747 - Use a better context when fetching resources for action modes
* commit '2dc59d56cbfe90fdae745496038352fdada6ee26': Fix bug 3347747 - Use a better context when fetching resources for action modes