Chih-Wei Huang - 2016-02-26

I spent two days to sync the CM branch completely (oh...).
I'll check if the current codebase matches the porting guidelines
we discussed in the devel group and adjust them accordingly.