Merge from alanly to rmtsc2