Backlog 534

@brosander please review