[MERGE] Latest fixes from 6.1