merged Blocklibrary/Info view change into Release branch