These were originally based on 19.9.0 code and were rebased with conflicts resolved. Fixed #1690. Co-Authored-By: dilyanpalauzov <git-dpa@aegee.org> Signed-off-by: Brett Randall <javabrett@gmail.com>
Co-Authored-By: Dustin Ingram <di@users.noreply.github.com> Co-Authored-By: Berker Peksag <berker.peksag@gmail.com>