#1277 Merged master with blocking resistance changes