fixed issue with stack overflow exception
Merge branch 'fix/page-descriptor-so' into develop

* fix/page-descriptor-so:
  fixed issue with stack overflow exception