Submit remove lab feature

merge last updates of submit_remove_lab branch with master. thanx!