merged with square/master