Merge "Fix nested layout issue" into devel/master