feature 1.2
feature 1.2 ready
merge from feature-1