Core changes and some on ui.
Integration changes
Merge remote branch 'remote/master'
Revert "Integration changes"

This reverts commit 8f5562efc51e78c0d1bce08cc9fb8a46e1f98aab.
Revert "Revert "Integration changes""

This reverts commit 7e387f555601cd8e9d6ff25085c2314e070cf085.
slyt changes
Revert "slyt changes"

This reverts commit fe9ff7392c31a6b786b0deae4887e29c39487a13.
Revert "Revert "slyt changes""

This reverts commit f34f649896e8b4780ac6767d320459f065a98dcc.
Neil's ui edits.
neil's edits + intergrations