Cherry pick from https://github.com/goldeneagle/limonade/commit/f08dbdf6fe38dd81e34178939b694a87efdd8149 Remember to add tests !
Cherry pick from goldeneagle@f08dbdf
Remember to add tests !