Merge tag 'bluenix/goal' into multiple-outputs2