F4OS object framework merged