Fixes: #2731 Updated plugin and functions using 1.1 new code