F 06 overextended and merged back into dev.

The integral changes were achieved a long time ago. has been used as a general check-in. Do not do this!