Merge commit 'ec2318f28a8230b6f68b9a1ea88a7b516993550e' * commit 'ec2318f28a8230b6f68b9a1ea88a7b516993550e': account manager api review changes