Merge tag '1.2.14' into develop

v1.2.14 SECURITY UPDATE