Merge "vp[89]_initalize_enc(): protect against multiple invocations" into main