Merge "fixed align problems when whitespaces are included" into devel/master