Fork boo, apply fix for FL-528