Commited unfinished changes to merge with 6.4