Current work before transfer to 1.7

Next update will be a port to 1.7