Topic

Merge

A collection of 2 issues