#1744: #1742: implemented comment across all three versions
opened by thuchacz