5.2 merge

Verified unit and integration tests pass and app starts and prop dev is savable.