Sync develop with release

Suggested reviewer: @illiatsi