Merge "Add namespace restrictions to block's log messages"