Merge to V1.5.0

From rtomac