Merge "Svace issues." into devel/master