Merge changes from topics 'bug/8836', 'bug/8772'