merge from Master:updownlife nov 30th