- merge changes from HEAD for swapmon fixes