Merge 1680_basop_port_object_editing_implementation_nokia_changes into...

Merge 1680_basop_port_object_editing_implementation_nokia_changes into 1680_basop_port_object_editing_implementation