Merge "OOM-1664 add annotation last-applied-configuration"