V1.3 branch

Created by: Chapoly1305

!!!!!!!!!! Please delete the instructions below and replace with PR description

If you have an issue number, please use a syntax of Fixes #12345 and a brief change description

If you do not have an issue number, please have a good description of the problem and the fix. Help the reviewer understand what to expect.

Make sure you delete these instructions (to prove you have read them).

!!!!!!!!!! Instructions end