There are actually several changes which are necessary to fix this completely, they are 4898277, 4974092, 4977660, 5271690, 5748275, 6087261, 6093788, and 6452690. These changes will all be available in 4.23 which will go into preview builds soon, so it might be better to wait for that.