Issues from DEVELOPER-1047

See master for more info