Missing dependency in #2 patch. Resubmitting it with adding dependency.