Implements: blueprint use-kwargs-consistently

Change-Id: I043fb7e6f22d7de2436a9bf8148b73905d9b3b18
Merge "Implements: blueprint use-kwargs-consistently"