Merge "Multi-line layout." into devel/master