All changes made as per Pivotable tracker issues
Conflict resolved