merge from Master:updownlife nov 24th