Merge "Upversion to 1.8.1-SNAPSHOT"