Merge branch 'master' into develop
Case 2844 - Fixed getting local_id and image style from $_POST.
Case 2844 - Code review.
Merge branch 'case-2844' into develop

* case-2844:
  Case 2844 - Code review.
  Case 2844 - Fixed getting local_id and image style from $_POST.
Merge branch 'develop'