Home | History | Annotate | Download | only in conf
History log of /src/sys/arch/amiga/conf/WSCONS
RevisionDateAuthorComments
 1.73  03-May-2023  phx Driver for the MNT ZZ9000 Zorro board. Submitted by Alain Runa.

It was formerly known as mntzz, which Alain released three years ago.
Since then, the ZZ9000 had several firmware updates which changed some
hardware interface details rendering the former driver non functional in some
aspects. Also the audio card plug-in ZZ9000AX became available from MNT
Research. Considering the major rewrite of the driver in some areas he
decided to rename it to zz9k(9). The driver consists of several sub-drivers
each addressing different functionality of the MNT ZZ9000 & ZZ9000AX combo
card.

zz9k* is the main card driver and need to be enabled if any of the sub-driver
is enabled. zz9k on its own is not very useful, it only provides a common
zz9kbus for the other sub-drivers to connect to, so only enable it if one of
the zz9k sub-drivers are enabled.
zzfb* represents the graphics driver for the boot console and the dumb
framebuffer for X11 based on WSCONS. ZZFB_CONSOLE option enables the ZZ9000
to become the boot console.
zz* represents the ethernet interface of the ZZ9000. It basically works but
is considered experimental.
zzax* represents the ZZ9000AX audio card driver, audio* attaches to it to
provide audio output and input functionality. The driver is not functional
yet.
zzusb* represents the ZZ9000AX usb driver. It was not implemented yet and
probably never will.
 1.72  07-Mar-2020  is Whitespace police
 1.71  04-Nov-2016  phx branches: 1.71.16;
wscons and Xorg support for Tseng ET4000/W32 based boards (grf6).
 1.70  03-Oct-2016  rkujawa Add a driver for MNTMN VA2000.

Supports accelerated wsdisplay console and running X via wsfb driver.
 1.69  16-Nov-2015  phx branches: 1.69.2;
wscons and Xorg support for CirrusLogic GD542x based boards (grf3).
 1.68  13-Nov-2015  phx Make sure the graphics device which has the console gets wsdisplay0,
otherwise neither virtual terminals nor Xorg's wsfb driver will work.
 1.67  03-Oct-2013  rkujawa branches: 1.67.6;
Enable USB keyboard and mouse in the WSCONS kernel.
 1.66  17-Aug-2012  abs branches: 1.66.2; 1.66.4;
Update all kernel configs mentioning WSEMUL_* but not already including
WSDISPLAY_COMPAT_USL using the following rules:
- If WSEMUL_ is commented out, add commented out out WSDISPLAY_COMPAT_USL
- If INSTALL or obviously memory constrained, add WSDISPLAY_DEFAULTSCREENS=1
and commented out WSDISPLAY_COMPAT_USL
- Otherwise add WSDISPLAY_COMPAT_USL

Some of the INSTALL configs for larger memory machines are probably suitable
for adding WSDISPLAY_COMPAT_USL.

Now wsconscfg(8) should be able to switch VTs when expected.

Implemented after no objection from tech-kern to the following:

On 5 June 2012 09:47, David Brownlee <abs@absd.org> wrote:
> wsconscfg(8) requires WSDISPLAY_COMPAT_USL in order to switch virtual
> terminals.
>
> Except when in an exceptionally memory or space constrained
> environment (INSTALL being the obvious case), is there any reason why
> all GENERIC and GENERIC-like kernels which have wscons enabled
> shouldn't also have WSDISPLAY_COMPAT_USL?
 1.65  07-Jun-2012  rkujawa Enable empb in GENERIC, fix build, rearrange files.amiga.
 1.64  24-Jan-2012  rkujawa Add voodoofb support. Allows using 3Dfx Voodoo 3 in G-REX as a console.
 1.63  15-Dec-2011  phx Amiga wscons/Xorg support, first phase.
Implemented wscons for CV64 and CV64/3D. Other graphics cards drivers are
prepared for it, but will not be attempted before Xorg is not running.
The wscons support is disabled by default. A GENERIC kernel should behave
like always. Use WSCONS to try out a kernel with wscons support.
Done by rkujawa@ and phx@.
 1.62  17-Oct-2007  garbled branches: 1.62.54; 1.62.58;
Merge the ppcoea-renovation branch to HEAD.

This branch was a major cleanup and rototill of many of the various OEA
cpu based PPC ports that focused on sharing as much code as possible
between the various ports to eliminate near-identical copies of files in
every tree. Additionally there is a new PIC system that unifies the
interface to interrupt code for all different OEA ppc arches. The work
for this branch was done by a variety of people, too long to list here.

TODO:
bebox still needs work to complete the transition to -renovation.
ofppc still needs a bunch of work, which I will be looking at.
ev64260 still needs to be renovated
amigappc was not attempted.

NOTES:
pmppc was removed as an arch, and moved to a evbppc target.
 1.61  07-Sep-2007  lukem Change WSCONS to just include GENERIC, enable wscons devices,
and disable conflicting other-style console devices.
 1.60  20-Aug-2007  is branches: 1.60.2;
Regenerate after addition of wdc_buddha.
 1.59  19-Aug-2007  is regenerate after removal of OSI networking
 1.58  16-Jul-2007  he branches: 1.58.4; 1.58.8;
Regenerated files after adding COMPAT_40.
 1.57  06-Jun-2007  martin regen
 1.56  12-Nov-2006  jmmv branches: 1.56.2; 1.56.8; 1.56.10; 1.56.16; 1.56.18;
Regen. Per bernd@'s instructions.
 1.55  11-Nov-2006  jmmv Remove tmpfs's experimental status. OK'ed by core@.
 1.54  26-Aug-2006  christos branches: 1.54.2; 1.54.4;
PR/34283: Gene ENonymous: Add IPFILTER_LOOKUP to the default kernel options
Also remove CCITT,NS,NIP
 1.53  26-Aug-2006  tsutsui Regen from GENERIC.in:
1.54:
> Disable SYSTRACE by default on all kernels (discussed with core)
1.55:
> Remove obsolete #options VERIFIED_EXEC, found by grep(1).
 1.52  12-Aug-2006  christos Disable SYSTRACE by default on all kernels (discussed with core)
 1.51  30-Jun-2006  tsutsui branches: 1.51.2;
Regen from GENERIC.in rev 1.53:
> Add CARP to further platforms
 1.50  28-Mar-2006  pavel branches: 1.50.4;
regen (added stf).
 1.49  05-Feb-2006  cube branches: 1.49.2; 1.49.4; 1.49.6;
Remove 'count' argument for pseudo-devices that ignore it
(vnd, bpfilter, ppp, gif, gre, tun, sl, strip, faith, stf).
 1.48  04-Feb-2006  rpaulo regen
 1.47  03-Feb-2006  reinoud branches: 1.47.2;
Regen GENERIC config files.
 1.46  10-Dec-2005  tsutsui branches: 1.46.2; 1.46.4;
Regen from GENERIC.in rev 1.48:
> Add veriexec stuff to the common config file.
 1.45  07-Dec-2005  tsutsui Regen from GENERIC.in rev 1.47:
> Remove obsolete options VNODE_OP_NOINLINE.
 1.44  07-Dec-2005  tsutsui Regen from GENERIC.in rev 1.46:
> Adjust comments for options FFS_NO_SNAPSHOT.
 1.43  03-Nov-2005  chs regen
 1.42  07-Oct-2005  tsutsui Regen from GENERIC.in rev 1.44:
> Add (commented out) file-system TMPFS in a proper file.

XXX: It seems `INSTALL_CONFIGURATION' in GENERIC.in should be reorganaized.
 1.41  19-Aug-2005  christos Enable ptyfs by default on the non-install and non small/tiny/ramdisk kernels
 1.40  19-Aug-2005  christos 64 bit inode changes.
 1.39  31-Jul-2005  yamt regen.
 1.38  30-Jul-2005  yamt regen.
 1.37  17-Jul-2005  hubertf Add support for reading cloop2 compressed filesystem image,
enable by putting VND_COMPRESSION into kernel config file.
Written by Cliff Wright, polished up slightly by me.
 1.36  07-Jul-2005  tron Add (commented out) IPSEC_NAT_T option.
 1.35  26-Jun-2005  rpaulo branches: 1.35.2;
Correct RCS Ids.
 1.34  26-Jun-2005  rpaulo Add PTYFS (commented out) in the correct form.
 1.33  09-Jun-2005  tsutsui Regen from GENERIC.in rev 1.36:
> - Rename options NEW_BUFQ_STRATEGY -> options BUFQ_READPRIO.
> (still commented out)
> - Add (also commented out) options BUFQ_PRIOCSCAN.
>
> Suggested by perry and soda on tech-kern.
> Please refer options(4) for details for these options.
 1.32  01-Jun-2005  jandberg regen: wsmux added (enabled only in WSCONS)
 1.31  25-Feb-2005  simonb branches: 1.31.2;
Regen for COMPAT_20 addition.
 1.30  20-Feb-2005  jdolecek regen: add SMBFS/nsmb, per PR port-amiga/29066 by Florian Stoehr
 1.29  18-Feb-2005  dsl Invert FFS_SNAPSHOT to FFS_NO_SNAPSHOT
 1.28  11-Feb-2005  dsl Add 'option FFS_SNAPSHOT' to most of the config files.
Commented out for kernels that appear to hace space constraints.
 1.27  31-Jan-2005  hannken Regen.
 1.26  17-Jan-2005  cube branches: 1.26.2;
Add tap(4) support to a random^Wcarefully chosen set of kernel configs.
All those kernels have a line for both tun and bridge, and if either is
commented out, tap is commented out also. With the exception of i386's
GENERIC_TINY.

XXX: we _need_ some way of making this more simple.
 1.25  13-Jan-2005  is branches: 1.25.2;
Regenerate from GENERIC.in: no more idesc - we're using wdc.
 1.24  10-Nov-2004  christos Add COMPAT_BSDPTY on all the kernels that have COMPAT options.
 1.23  04-Sep-2004  manu IPv4 PIM support, based on a submission from Pavlin Radoslavov posted on
tech-net@
 1.22  28-Jun-2004  bouyer Regen, added P1003_1B_SEMAPHORE.
 1.21  26-Jun-2004  abs Regenerate from master config files
 1.20  23-Feb-2004  jandberg branches: 1.20.2;
regen after wsfont changes
 1.19  08-Oct-2003  bouyer Regen: add atabus
 1.18  22-Sep-2003  jandberg regen after wsmouse addition
 1.17  22-Sep-2003  cl regen
 1.16  27-Jul-2003  is Regenerate from GENERIC.in to include pseudo-device ksyms, where
appropriate.
 1.15  16-Apr-2003  is branches: 1.15.2;
make /dev/reload optional (it is implemented for a.out kernels only, at
the moment.)
 1.14  10-Apr-2003  christos Bye Bye UCONSOLE
 1.13  27-Feb-2003  perseant Make BRIDGE_IPF an option, and document it. Add it (commented) to GENERIC.
Let brconfig tell whether the bridge is using the ipfilter hook, or not.
 1.12  22-Nov-2002  wiz regen
 1.11  14-Oct-2002  elric Added commented out cgd(4)s to GENERIC configs.
 1.10  06-Oct-2002  provos regen from GENERIC.in
 1.9  18-Sep-2002  lukem regen for: enable USERCONF
 1.8  05-Jul-2002  abs Regen from GENERIC.in 1.2:
Only difference is that INSTALL now defines VNODE_OP_NOINLINE and MALLOC_NOLINE
 1.7  18-Jun-2002  lukem Regenerate with new m4 mechanism (vs old cpp mechanism).
New files are same as old (except for whitespace differences), except
that the new GENERIC doesn't have melody, because GENERIC defines
DRACO and the latter can't have it.
 1.6  17-Jun-2002  lukem regen for clockctl
 1.5  30-May-2002  thorpej Regenerate.
 1.4  25-Apr-2002  atatat branches: 1.4.2; 1.4.4;
Add the INCLUDE_CONFIG_FILE option to all config files. In config
files that are generic (ie, GENERIC, GENERICSBC, GENERIC32, ALL, or
ALPHA), it is uncommented.
 1.3  19-Apr-2002  heinz regen after GENERIC v1.178
 1.2  12-Apr-2002  gmcgarry Add commented-out USERCONF option. Mainly useful for install media
and can be optionally enabled based on miniroot and ramdisk size
requirements.
 1.1  13-Mar-2002  jandberg branches: 1.1.2; 1.1.6;
added WSCONS config file and makefile target to generate it
 1.1.6.7  11-Dec-2002  thorpej Sync with HEAD.
 1.1.6.6  18-Oct-2002  nathanw Catch up to -current.
 1.1.6.5  01-Aug-2002  nathanw Catch up to -current.
 1.1.6.4  20-Jun-2002  nathanw Catch up to -current.
 1.1.6.3  17-Apr-2002  nathanw Catch up to -current.
 1.1.6.2  01-Apr-2002  nathanw Catch up to -current.
(CVS: It's not just a program. It's an adventure!)
 1.1.6.1  13-Mar-2002  nathanw file WSCONS was added on branch nathanw_sa on 2002-04-01 07:38:55 +0000
 1.1.2.5  10-Oct-2002  jdolecek sync kqueue with -current; this includes merge of gehenna-devsw branch,
merge of i386 MP branch, and part of autoconf rototil work
 1.1.2.4  06-Sep-2002  jdolecek sync kqueue branch with HEAD
 1.1.2.3  23-Jun-2002  jdolecek catch up with -current on kqueue branch
 1.1.2.2  16-Mar-2002  jdolecek Catch up with -current.
 1.1.2.1  13-Mar-2002  jdolecek file WSCONS was added on branch kqueue on 2002-03-16 15:55:49 +0000
 1.4.4.3  24-Oct-2002  lukem regen from GENERIC after ipfilter 3.4.29 upgrade
 1.4.4.2  01-Aug-2002  lukem Regenerate from GENERIC 1.179.4.2 (requested by lukem in ticket #314):
 1.4.4.1  30-May-2002  tv Pull up regen (requested by thorpej in ticket #94).
 1.4.2.2  16-Jul-2002  gehenna catch up with -current.
 1.4.2.1  09-Jul-2002  gehenna catch up with -current.
 1.15.2.11  11-Dec-2005  christos Sync with head.
 1.15.2.10  10-Nov-2005  skrll Sync with HEAD. Here we go again...
 1.15.2.9  04-Mar-2005  skrll Sync with HEAD.

Hi Perry!
 1.15.2.8  15-Feb-2005  skrll Sync with HEAD.
 1.15.2.7  04-Feb-2005  skrll Sync with HEAD.
 1.15.2.6  24-Jan-2005  skrll Sync with HEAD.
 1.15.2.5  17-Jan-2005  skrll Sync with HEAD.
 1.15.2.4  14-Nov-2004  skrll Sync with HEAD.
 1.15.2.3  21-Sep-2004  skrll Fix the sync with head I botched.
 1.15.2.2  18-Sep-2004  skrll Sync with HEAD.
 1.15.2.1  03-Aug-2004  skrll Sync with HEAD
 1.20.2.4  11-Aug-2007  bouyer Regen for ticket 11356
 1.20.2.3  15-Jul-2004  he branches: 1.20.2.3.2; 1.20.2.3.4;
Pull up regenerated files (requested by atatat in ticket #663):
Add "options SYSCTL_INCLUDE_DESCR" to a lot of configurations,
but commented out in most of them.
 1.20.2.2  02-Jul-2004  he Pull up regenerated files (requested by bouyer in ticket #573):
Add options P1003_1B_SEMAPHORE to all GENERIC-like kernel
config files where SYSV* options were already present
(commented out if the SYSV* options are commented out).
Fixes PR#25897 and PR#25898.
 1.20.2.1  30-Jun-2004  jdc Pull up revision 1.21 (requested by abs in ticket #567).

Regenerate from master config files
 1.20.2.3.4.1  11-Aug-2007  bouyer regen for ticket 11356
 1.20.2.3.2.1  11-Aug-2007  bouyer regen for ticket 11356
 1.25.2.1  29-Apr-2005  kent sync with -current
 1.26.2.2  19-Mar-2005  yamt sync with head. xen and whitespace. xen part is not finished.
 1.26.2.1  12-Feb-2005  yamt sync with head.
 1.31.2.3  05-Nov-2005  tron Regen for ticket #929.
 1.31.2.2  14-Aug-2005  riz Pull up revision 1.37 (requested by hubertf in ticket #625):
Add support for reading cloop2 compressed filesystem images,
enable by putting VND_COMPRESSION into kernel config file.
Written by Cliff Wright, polished up slightly by me.
 1.31.2.1  18-Jul-2005  riz Pull up revision 1.36 (requested by tron in ticket #566):
Add (commented out) IPSEC_NAT_T option.
 1.35.2.4  27-Oct-2007  yamt sync with head.
 1.35.2.3  03-Sep-2007  yamt sync with head.
 1.35.2.2  30-Dec-2006  yamt sync with head.
 1.35.2.1  21-Jun-2006  yamt sync with head.
 1.46.4.1  09-Sep-2006  rpaulo sync with head
 1.46.2.1  18-Feb-2006  yamt sync with head.
 1.47.2.1  22-Apr-2006  simonb Sync with head.
 1.49.6.1  31-Mar-2006  tron Merge 2006-03-31 NetBSD-current into the "peter-altq" branch.
 1.49.4.1  19-Apr-2006  elad sync with head - hopefully this will work
 1.49.2.3  03-Sep-2006  yamt sync with head.
 1.49.2.2  11-Aug-2006  yamt sync with head
 1.49.2.1  01-Apr-2006  yamt sync with head.
 1.50.4.1  13-Jul-2006  gdamore Merge from HEAD.
 1.51.2.2  22-Sep-2006  riz Regen for ticket #170
 1.51.2.1  14-Aug-2006  tron Pull up following revision(s) (requested by elad in ticket #17):
sys/arch/sparc/conf/KRUPS: revision 1.38
sys/arch/i386/conf/XEN2_DOMU: revision 1.2
sys/arch/i386/conf/GENERIC_LAPTOP: revision 1.197
sys/arch/sgimips/conf/GENERIC32_IP2x: revision 1.53
sys/arch/evbsh5/conf/SIMULATOR: revision 1.12
sys/arch/sparc/conf/MRCOFFEE: revision 1.17
sys/arch/next68k/conf/GENERIC: revision 1.104
sys/arch/i386/conf/VIRTUALPC: revision 1.44
sys/arch/ews4800mips/conf/GENERIC: revision 1.11
sys/arch/evbsh5/conf/CAYMAN: revision 1.23
sys/arch/arc/conf/GENERIC: revision 1.141
sys/arch/amd64/conf/GENERIC: revision 1.103
sys/arch/sun3/conf/GENERIC3X: revision 1.90
sys/arch/evbarm/conf/HDL_G: revision 1.3
sys/arch/sun2/conf/GENERIC: revision 1.57
sys/arch/news68k/conf/GENERIC_TINY: revision 1.51
sys/arch/evbppc/conf/EXPLORA451: revision 1.27
sys/arch/amiga/conf/GENERIC.in: revision 1.54
sys/arch/mac68k/conf/GENERIC: revision 1.174
sys/arch/acorn26/conf/GENERIC: revision 1.45
sys/arch/shark/conf/GENERIC: revision 1.64
sys/arch/cesfic/conf/GENERIC: revision 1.44
sys/arch/mvme68k/conf/GENERIC: revision 1.68
sys/arch/i386/conf/XEN2_DOM0: revision 1.4
sys/arch/atari/conf/GENERIC.in: revision 1.63
sys/arch/amiga/conf/GENERIC: revision 1.240
sys/arch/i386/conf/LAMB: revision 1.65
sys/arch/i386/conf/GENERIC: revision 1.773
sys/arch/acorn32/conf/EB7500ATX: revision 1.26
sys/arch/x68k/conf/GENERIC: revision 1.128
sys/arch/vax/conf/GENERIC: revision 1.153
sys/arch/atari/conf/ATARITT: revision 1.81
sys/arch/mipsco/conf/GENERIC: revision 1.60
sys/arch/cobalt/conf/GENERIC: revision 1.101
sys/arch/evbarm/conf/ARMADILLO9: revision 1.13
sys/arch/ofppc/conf/GENERIC: revision 1.93
sys/arch/atari/conf/MILAN-PCIIDE: revision 1.51
sys/arch/arc/conf/RPC44: revision 1.26
sys/arch/sparc64/conf/GENERIC: revision 1.59
sys/arch/i386/conf/XEN3_DOMU: revision 1.2
sys/arch/hp700/conf/GENERIC: revision 1.68
sys/arch/atari/conf/MILAN-ISAIDE: revision 1.47
sys/arch/macppc/conf/GENERIC: revision 1.231
sys/arch/dreamcast/conf/GENERIC: revision 1.72
sys/arch/news68k/conf/GENERIC: revision 1.80
sys/arch/hp300/conf/GENERIC: revision 1.133
sys/arch/mmeye/conf/GENERIC: revision 1.82
sys/arch/macppc/conf/MAMBO: revision 1.2
sys/arch/cats/conf/GENERIC: revision 1.107
sys/arch/atari/conf/FALCON: revision 1.79
sys/arch/acorn32/conf/GENERIC: revision 1.71
sys/arch/sparc/conf/GENERIC: revision 1.190
sys/arch/news68k/conf/LIBERO: revision 1.40
sys/arch/amiga/conf/DRACO: revision 1.114
sys/arch/cobalt/conf/INSTALL: revision 1.23
sys/arch/luna68k/conf/GENERIC: revision 1.73
sys/arch/bebox/conf/GENERIC: revision 1.100
sys/arch/pmax/conf/GENERIC: revision 1.147
sys/arch/amiga/conf/WSCONS: revision 1.52
sys/arch/macppc/conf/POWERMAC_G5: revision 1.2
sys/arch/alpha/conf/ALPHA: revision 1.218
sys/arch/sun3/conf/GENERIC: revision 1.133
sys/arch/prep/conf/GENERIC: revision 1.124
sys/arch/alpha/conf/GENERIC: revision 1.291
sys/arch/atari/conf/HADES: revision 1.71
sys/arch/newsmips/conf/GENERIC: revision 1.93
sys/arch/netwinder/conf/GENERIC: revision 1.82
sys/arch/hpcmips/conf/GENERIC: revision 1.190
sys/arch/amiga/conf/AMIGA: revision 1.98
sys/arch/sbmips/conf/GENERIC: revision 1.54
sys/arch/pc532/conf/GENERIC: revision 1.64
sys/arch/sgimips/conf/GENERIC32_IP3x: revision 1.53
Disable SYSTRACE by default on all kernels (discussed with core)
 1.54.4.1  10-Dec-2006  yamt sync with head.
 1.54.2.1  18-Nov-2006  ad Sync with head.
 1.56.18.1  03-Sep-2007  wrstuden Sync w/ NetBSD-4-RC_1
 1.56.16.2  03-Oct-2007  garbled Sync with HEAD
 1.56.16.1  26-Jun-2007  garbled Sync with HEAD.
 1.56.10.1  11-Jul-2007  mjf Sync with head.
 1.56.8.4  12-Oct-2007  ad Fix merge errors.
 1.56.8.3  09-Oct-2007  ad Sync with head.
 1.56.8.2  20-Aug-2007  ad Sync with HEAD.
 1.56.8.1  09-Jun-2007  ad Sync with head.
 1.56.2.1  06-Jun-2007  bouyer Regen for ticket 699.
 1.58.8.2  02-Oct-2007  joerg Sync with HEAD.
 1.58.8.1  03-Sep-2007  jmcneill Sync with HEAD.
 1.58.4.2  10-Sep-2007  skrll Sync with HEAD.
 1.58.4.1  03-Sep-2007  skrll Sync with HEAD.
 1.60.2.1  06-Nov-2007  matt sync with HEAD
 1.62.58.1  18-Feb-2012  mrg merge to -current.
 1.62.54.3  22-May-2014  yamt sync with head.

for a reference, the tree before this commit was tagged
as yamt-pagecache-tag8.

this commit was splitted into small chunks to avoid
a limitation of cvs. ("Protocol error: too many arguments")
 1.62.54.2  30-Oct-2012  yamt sync with head
 1.62.54.1  17-Apr-2012  yamt sync with head
 1.66.4.1  18-May-2014  rmind sync with head
 1.66.2.2  03-Dec-2017  jdolecek update from HEAD
 1.66.2.1  20-Aug-2014  tls Rebase to HEAD as of a few days ago.
 1.67.6.3  05-Dec-2016  skrll Sync with HEAD
 1.67.6.2  05-Oct-2016  skrll Sync with HEAD
 1.67.6.1  27-Dec-2015  skrll Sync with HEAD (as of 26th Dec)
 1.69.2.2  07-Jan-2017  pgoyette Sync with HEAD. (Note that most of these changes are simply $NetBSD$
tag issues.)
 1.69.2.1  04-Nov-2016  pgoyette Sync with HEAD
 1.71.16.1  08-Apr-2020  martin Merge changes from current as of 20200406

RSS XML Feed