Merge branch 'master_condition_description'