use single line load tag instead of multiple lines
Merge remote-tracking branch 'upstream/master'