merging activation code to generic branch