Merge "Fix multiton issue"