'Merge' checklimit disable code from 1742-apilog branch