Merged from dinopollano-master