Testing TBG. This commit addresses issue #Acms-1, issue #Acms-2, issue #Acms-3, issue #Acms-4 and issue #Acms-5.