Big thanks to Christian Mollekopf and Vishesh Handa for their help Squashed commit from feature/baloo