Update to bishop validation -- its a tricky one
Merge remote-tracking branch 'origin/makopov' into mbryja
removed unnecessary resources.