Changes for disabled context functionality.