Clarifications in response to merge req. comments