Merge branch 'birecs' into devel