Looks like I already failed that project a little :) (cherry picked from commit 066771b2d15748edc72095b75c4626bf445266aa)