Layout metrics and keylines update
merge from github
merge from github