Bugs 13109, 13083 fixed