Merged PASDK 1.2.4 changes. Fixed following bugs: