Solved A and B in CR213.
SRM 601-I
Merge branch 'CR213'