Merged @ruezel's latest changes in the main branch into thulya's forked branch.