5.2 merge

Tests all pass. App starts up and prop dev works. S2s changes have been merged in.