Release Preview 4.2.1047

1048 should correct all issues mentioned