Applying latest changes including plexht package.mk update