Closes FLX-1052, Thanks to @wijnen This issue seems to be resolved now. Some testing needs to be performed, but things look good.