Application Update w\ Merge Request

Updated for 5.5.4

Merge Request: !11 (merged)

cc: @andymaks , @thomas.shepherd