OperationVisiblityExtension fix
Merge branch 'Bootstrap'