* commit '5a6c3d491ccac07ef3f6a624a8a3e0c36959b661': DO NOT MERGE For bug 4422428 Squashed commit of the following: