Merged work (TOPs related)

Merged work (#1513)

Merged work (#1492)

Merged work (#1404, #1512)

Merged work (#1404, #1511)

Merged work (#1404, #1511)

Merged work (#1509, #1505, #1506, #1504, #1507, #1508)

Merged work (#1489, #1502, #1503)

Merged work (#1489)

Merged work (#1501, #1493, #1497, #1498, #1500)