#MTA-3 #resolve  set to purple
Merge remote-tracking branch 'origin/master'