Integrate changes from teachPress 4.3.11 and 4.3.12