Bugs: Pivotal #50752643, Pivotal  #50772743