Keeping up-to-date

Integration with contributions:
- valeriebertin 	[fix_jira_142]