First commit on branch devel_A