Bug 881957 - Address Kaze's comment and rebase to master