Merge of master with pdf creation and pagination into UI branch