Merge branch 'develop' into lbudginas/#379_jump_to_page_negative_value_bug