Merge changes from topic 'fetch-binary-cte'