Merge branch 'mkoller/contrib' into dev

Change-Id: I058ae18343c9a7c91db8a5137fe22fce605e3b7b