Adding AWS Instances features
:Merge remote-tracking branch 'origin'