merges master (so, no sfa-cm anymore)