merged RMerlin master build