Merge "Fix alignment issues with field and editor." into devel/master