Merged changes from ams2990