Development V 0.0.3

Incorporated changes from A36224-500 development