merge of SIFTs Branch