Master+cap 3.2

CAP-3.2 changes.