merge 2.23-Dec-14 to FEC-2323
merge 2.23-Dec-14 to FEC-2323