Merge from upstream 30.09.2014