Merge "Fix AES encryption for SP" into qt-dev