Merge remote-tracking branch 'origin/master' into 251-create-chess-bundle-via-maven