Opensource fixes 5.3