Merge tag '2.8.1' into develop

Added post-type exclude support