Bugfix: multi-commit of apply
Merge remote-tracking branch 'origin/master'