added partial l/load action handling
Merge remote-tracking branch 'origin/master'