Pulling changes of action context from Nitish branch