Mob 944

@Hakubo - could you look at this as this is a change that might make some stuff go bad ;)

//DO NOT MERGE